Draff/Tachiyomi-Extensions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Readmanhwa.com enhanced search and filters - fix #4972 (#5109)

Browse Source 
Readmanhwa.com enhanced search and filters - fix #4972
This commit is contained in:
antonycaporossi 2020-12-12 19:03:49 +01:00 committed by GitHub
parent 1300b76806
commit 93f53505a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 145 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/en/readmanhwa/build.gradle
View File

@ -5,7 +5,7 @@ ext {
extName = 'ReadManhwa' extName = 'ReadManhwa'
pkgNameSuffix = 'en.readmanhwa' pkgNameSuffix = 'en.readmanhwa'
extClass = '.ReadManhwa' extClass = '.ReadManhwa'
extVersionCode = 6 extVersionCode = 7
libVersion = '1.2' libVersion = '1.2'
containsNsfw = true containsNsfw = true
} }

214
src/en/readmanhwa/src/eu/kanade/tachiyomi/extension/en/readmanhwa/ReadManhwa.kt
View File

@ -81,7 +81,7 @@ class ReadManhwa : ConfigurableSource, HttpSource() {
// Popular // Popular
override fun popularMangaRequest(page: Int): Request { override fun popularMangaRequest(page: Int): Request {
return GET(getMangaUrl("$baseUrl/api/comics?page=$page&q=&sort=popularity&order=desc&duration=week"), headers) return GET(getMangaUrl("$baseUrl/api/comics?per_page=36&page=$page&q=&sort=popularity&order=desc&duration=week"), headers)
} }
override fun popularMangaParse(response: Response): MangasPage = parseMangaFromJson(response) override fun popularMangaParse(response: Response): MangasPage = parseMangaFromJson(response)
@ -89,7 +89,7 @@ class ReadManhwa : ConfigurableSource, HttpSource() {
// Latest // Latest
override fun latestUpdatesRequest(page: Int): Request { override fun latestUpdatesRequest(page: Int): Request {
return GET(getMangaUrl("$baseUrl/api/comics?page=$page&q=&sort=uploaded_at&order=desc&duration=day"), headers) return GET(getMangaUrl("$baseUrl/api/comics?per_page=36&page=$page&q=&sort=uploaded_at&order=desc&duration=day"), headers)
} }
override fun latestUpdatesParse(response: Response): MangasPage = parseMangaFromJson(response) override fun latestUpdatesParse(response: Response): MangasPage = parseMangaFromJson(response)
@ -100,7 +100,7 @@ class ReadManhwa : ConfigurableSource, HttpSource() {
val enableNsfw = (filters.find { it is NSFWFilter } as? Filter.CheckBox)?.state ?: true val enableNsfw = (filters.find { it is NSFWFilter } as? Filter.CheckBox)?.state ?: true
val url = HttpUrl.parse("$baseUrl/api/comics")!!.newBuilder() val url = HttpUrl.parse("$baseUrl/api/comics")!!.newBuilder()
.addQueryParameter("per_page", "18") .addQueryParameter("per_page", "36")
.addQueryParameter("page", page.toString()) .addQueryParameter("page", page.toString())
.addQueryParameter("order", "desc") .addQueryParameter("order", "desc")
.addQueryParameter("q", query) .addQueryParameter("q", query)
@ -108,8 +108,44 @@ class ReadManhwa : ConfigurableSource, HttpSource() {
filters.forEach { filter -> filters.forEach { filter ->
when (filter) { when (filter) {
is SortFilter -> url.addQueryParameter("sort", filter.toUriPart()) is GenreFilter -> {
is GenreFilter -> url.addQueryParameter("tags", filter.toUriPart())
val genreInclude = mutableListOf<String>()
filter.state.forEach {
if (it.state == 1) {
genreInclude.add(it.id)
}
}
if (genreInclude.isNotEmpty()) {
genreInclude.forEach { genre ->
url.addQueryParameter("tags[]", genre)
}
}
}
is StatusFilter -> {
val statusInclude = mutableListOf<String>()
filter.state.forEach {
if (it.state == 1) {
statusInclude.add(it.id)
}
}
if (statusInclude.isNotEmpty()) {
statusInclude.forEach { status ->
url.addQueryParameter("statuses[]", status)
}
}
}
is OrderBy -> {
var orderby = ""
if (filter.state!!.ascending) {
orderby = "asc"
} else {
orderby = "desc"
}
var sort = arrayOf("uploaded_at", "title", "pages", "favorites", "popularity")[filter.state!!.index]
url.addQueryParameter("sort", sort)
url.addQueryParameter("order", orderby)
}
is DurationFilter -> url.addQueryParameter("duration", filter.toUriPart()) is DurationFilter -> url.addQueryParameter("duration", filter.toUriPart())
} }
} }
@ -211,78 +247,115 @@ class ReadManhwa : ConfigurableSource, HttpSource() {
override fun getFilterList() = FilterList( override fun getFilterList() = FilterList(
NSFWFilter().apply { state = isNSFWEnabledInPref() }, NSFWFilter().apply { state = isNSFWEnabledInPref() },
GenreFilter(getGenreList()), GenreFilter(getGenreList()),
StatusFilter(getStatusList()),
DurationFilter(getDurationList()), DurationFilter(getDurationList()),
SortFilter(getSortList()) OrderBy()
) )
private class NSFWFilter : Filter.CheckBox("Show NSFW", true) private class NSFWFilter : Filter.CheckBox("Show NSFW", true)
private class Genre(name: String, val id: String = name) : Filter.TriState(name)
private class GenreFilter(pairs: Array<Pair<String, String>>) : UriPartFilter("Genre", pairs) private class GenreFilter(genres: List<Genre>) : Filter.Group<Genre>("GENRES", genres)
private class Status(name: String, val id: String = name) : Filter.TriState(name)
private class DurationFilter(pairs: Array<Pair<String, String>>) : UriPartFilter("Duration", pairs) private class StatusFilter(status: List<Status>) : Filter.Group<Status>("STATUS", status)
private class DurationFilter(pairs: Array<Pair<String, String>>) : UriPartFilter("DURATION", pairs)
private class SortFilter(pairs: Array<Pair<String, String>>) : UriPartFilter("Sorted by", pairs)
open class UriPartFilter(displayName: String, private val vals: Array<Pair<String, String>>) : open class UriPartFilter(displayName: String, private val vals: Array<Pair<String, String>>) :
Filter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) { Filter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
fun toUriPart() = vals[state].second fun toUriPart() = vals[state].second
} }
private fun getGenreList() = arrayOf( private fun getGenreList() = listOf(
Pair("All", "0"), Genre("Action", "14"),
Pair("Action", "14"), Genre("Adventure", "6"),
Pair("Adult", "27"), Genre("All Ages", "73"),
Pair("Adventure", "6"), Genre("Angst", "50"),
Pair("Angst", "50"), Genre("BL", "20"),
Pair("BL", "20"), Genre("Boxing", "58"),
Pair("Comedy", "1"), Genre("College", "82"),
Pair("Completed", "53"), Genre("Comedy", "1"),
Pair("Crime", "18"), Genre("Comic", "70"),
Pair("Cultivation", "37"), Genre("Completed", "53"),
Pair("Drama", "2"), Genre("Cooking", "67"),
Pair("Ecchi", "46"), Genre("Crime", "18"),
Pair("Fantasy", "8"), Genre("Cultivation", "37"),
Pair("GL", "42"), Genre("Demons", "65"),
Pair("Gender Bender", "35"), Genre("Drama", "2"),
Pair("Gossip", "12"), Genre("Ecchi", "46"),
Pair("Harem", "7"), Genre("Fantasy", "8"),
Pair("Historical", "33"), Genre("Gender Bender", "35"),
Pair("Horror", "19"), Genre("GL", "42"),
Pair("Incest", "10"), Genre("Goshiwon", "80"),
Pair("Isekai", "28"), Genre("Gossip", "12"),
Pair("Josei", "48"), Genre("Harem", "7"),
Pair("M", "43"), Genre("Historical", "33"),
Pair("Manhua", "38"), Genre("Horror", "19"),
Pair("Manhwa", "40"), Genre("Incest", "10"),
Pair("Martial arts", "26"), Genre("Isekai", "28"),
Pair("Mature", "30"), Genre("Josei", "48"),
Pair("Medical", "24"), Genre("Long Strip", "78"),
Pair("Modern", "51"), Genre("M", "43"),
Pair("Mystery", "15"), Genre("Magic", "59"),
Pair("NTR", "32"), Genre("Magical", "69"),
Pair("Philosophical", "44"), Genre("Magical Girls", "77"),
Pair("Post Apocalyptic", "49"), Genre("Manga", "56"),
Pair("Psychological", "16"), Genre("Manhua", "38"),
Pair("Romance", "3"), Genre("Manhwa", "40"),
Pair("Rpg", "41"), Genre("Manhwa18", "81"),
Pair("School LIfe", "11"), Genre("Martial arts", "26"),
Pair("Sci Fi", "9"), Genre("Mature", "30"),
Pair("Seinen", "31"), Genre("Mecha", "54"),
Pair("Shoujo", "36"), Genre("Medical", "24"),
Pair("Shounen", "29"), Genre("Moder", "64"),
Pair("Slice of Life", "4"), Genre("Modern", "51"),
Pair("Smut", "13"), Genre("Monster/Tentacle", "57"),
Pair("Sports", "5"), Genre("Music", "75"),
Pair("Superhero", "45"), Genre("Mystery", "15"),
Pair("Supernatural", "22"), Genre("NTR", "32"),
Pair("Suspense", "47"), Genre("Office", "84"),
Pair("Thriller", "17"), Genre("Office Life", "79"),
Pair("TimeTravel", "52"), Genre("One shot", "61"),
Pair("Tragedy", "23"), Genre("Philosophical", "44"),
Pair("Vanilla", "34"), Genre("Post Apocalyptic", "49"),
Pair("Webtoon", "39"), Genre("Psychological", "16"),
Pair("Yaoi", "21"), Genre("Revenge", "74"),
Pair("Yuri", "25") Genre("Reverse harem", "72"),
Genre("Romance", "3"),
Genre("Rpg", "41"),
Genre("School LIfe", "11"),
Genre("Sci Fi", "9"),
Genre("Seinen", "31"),
Genre("Shoujo", "36"),
Genre("Shoujo Ai", "62"),
Genre("Shounen", "29"),
Genre("Shounen Ai", "63"),
Genre("Slice of Life", "4"),
Genre("Smut", "13"),
Genre("Sports", "5"),
Genre("Super power", "71"),
Genre("Superhero", "45"),
Genre("Supernatural", "22"),
Genre("Suspense", "47"),
Genre("Thriller", "17"),
Genre("Time Travel", "55"),
Genre("TimeTravel", "52"),
Genre("ToonPoint", "83"),
Genre("Tragedy", "23"),
Genre("Uncensored", "85"),
Genre("Vampire", "68"),
Genre("Vanilla", "34"),
Genre("Web Comic", "76"),
Genre("Webtoon", "39"),
Genre("Webtoons", "60"),
Genre("Yaoi", "21"),
Genre("Youkai", "66"),
Genre("Yuri", "25")
)
private fun getStatusList() = listOf(
Status("Ongoing", "ongoing"),
Status("Complete", "complete"),
Status("On Hold", "onhold"),
Status("Canceled", "canceled")
) )
private fun getDurationList() = arrayOf( private fun getDurationList() = arrayOf(
@ -293,9 +366,10 @@ class ReadManhwa : ConfigurableSource, HttpSource() {
Pair("Day", "day") Pair("Day", "day")
) )
private fun getSortList() = arrayOf( private class OrderBy : Filter.Sort(
Pair("Popularity", "popularity"), "Order by",
Pair("Date", "uploaded_at") arrayOf("Date", "Title", "Pages", "Favorites", "Popularity"),
Selection(0, false)
) )
override fun setupPreferenceScreen(screen: PreferenceScreen) { override fun setupPreferenceScreen(screen: PreferenceScreen) {