Manhuadui: fix image server changed problem & support category search (#1367)

Manhuadui: fix image server changed problem & support category search

src/zh/manhuadui/build.gradle

@@ -5,7 +5,7 @@ ext {
     appName = 'Tachiyomi: Manhuadui'
     pkgNameSuffix = 'zh.manhuadui'
     extClass = '.Manhuadui'
-    extVersionCode = 2
+    extVersionCode = 3
     libVersion = '1.2'
 }
 

src/zh/manhuadui/src/eu/kanade/tachiyomi/extension/zh/manhuadui/Manhuadui.kt

@@ -26,7 +26,7 @@ class Manhuadui : ParsedHttpSource() {
     override val baseUrl = "https://www.manhuadui.com"
     override val lang = "zh"
     override val supportsLatest = true
-    val imageServer = arrayOf("https://res.333dm.com", "https://res02.333dm.com")
+    val imageServer = arrayOf("https://mhcdn.manhuazj.com", "https://res.333dm.com", "https://res02.333dm.com")
 
     override fun popularMangaSelector() = "li.list-comic"
     override fun searchMangaSelector() = popularMangaSelector()
@@ -43,8 +43,18 @@ class Manhuadui : ParsedHttpSource() {
     override fun popularMangaRequest(page: Int) = GET("$baseUrl/list_$page/", headers)
     override fun latestUpdatesRequest(page: Int) = GET("$baseUrl/update/$page/", headers)
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
-        val url = HttpUrl.parse("$baseUrl/search/?keywords=$query")?.newBuilder()
-        return GET(url.toString(), headers)
+        if (query != "") {
+            val url = HttpUrl.parse("$baseUrl/search/?keywords=$query")?.newBuilder()
+            return GET(url.toString(), headers)
+        } else {
+            var params = filters.map {
+                if (it is UriPartFilter) {
+                    it.toUriPart()
+                } else ""
+            }.filter { it != "" }.joinToString("-")
+            val url = HttpUrl.parse("$baseUrl/list/$params/$page/")?.newBuilder()
+            return GET(url.toString(), headers)
+        }
     }
 
     override fun mangaDetailsRequest(manga: SManga) = GET(baseUrl + manga.url, headers)
@@ -68,12 +78,22 @@ class Manhuadui : ParsedHttpSource() {
 
     override fun searchMangaFromElement(element: Element): SManga {
         val manga = SManga.create()
-        element.select("a.image-link").first().let {
-            manga.setUrlWithoutDomain(it.attr("href"))
-            manga.title = it.attr("title").trim()
-            manga.thumbnail_url = it.select("img").attr("src").trim()
+        val els = element.select("a.image-link")
+        if (els.size == 0) {
+            element.select("li.list-comic").first().let {
+                manga.setUrlWithoutDomain(it.select("a").attr("href"))
+                manga.title = it.select("span").attr("title").trim()
+                manga.thumbnail_url = it.select("a > img").attr("src").trim()
+                manga.author = it.select("span > p").first().text().split("：")[1].trim()
+            }
+        } else {
+            element.select("a.image-link").first().let {
+                manga.setUrlWithoutDomain(it.attr("href"))
+                manga.title = it.attr("title").trim()
+                manga.thumbnail_url = it.select("img").attr("src").trim()
+            }
+            manga.author = element.select("p.auth").text().trim()
         }
-        manga.author = element.select("p.auth").text().trim()
         return manga
     }
 
@@ -140,16 +160,53 @@ class Manhuadui : ParsedHttpSource() {
 
     override fun imageUrlParse(document: Document) = ""
 
-    private class GenreFilter(genres: Array<String>) : Filter.Select<String>("Genre", genres)
-
     override fun getFilterList() = FilterList(
-        GenreFilter(getGenreList())
+        CategoryGroup(),
+        RegionGroup(),
+        GenreGroup(),
+        ProgressGroup()
     )
 
-    private fun getGenreList() = arrayOf(
-        "All"
-    )
+    private class CategoryGroup : UriPartFilter("按类型", arrayOf(
+        Pair("全部", ""),
+        Pair("儿童漫画", "ertong"),
+        Pair("少年漫画", "shaonian"),
+        Pair("少女漫画", "shaonv"),
+        Pair("青年漫画", "qingnian")
+    ))
 
+    private class ProgressGroup : UriPartFilter("按进度", arrayOf(
+        Pair("全部", ""),
+        Pair("已完结", "wanjie"),
+        Pair("连载中", "lianzai")
+    ))
 
+    private class RegionGroup : UriPartFilter("按地区", arrayOf(
+        Pair("全部", ""),
+        Pair("日本", "riben"),
+        Pair("大陆", "dalu"),
+        Pair("香港", "hongkong"),
+        Pair("台湾", "taiwan"),
+        Pair("欧美", "oumei"),
+        Pair("韩国", "hanguo"),
+        Pair("其他", "qita")
+    ))
+
+    private class GenreGroup : UriPartFilter("按剧情", arrayOf(
+        Pair("全部", ""),
+        Pair("热血", "rexue"),
+        Pair("冒险", "maoxian"),
+        Pair("玄幻", "xuanhuan"),
+        Pair("搞笑", "gaoxiao"),
+        Pair("恋爱", "lianai"),
+        Pair("宠物", "chongwu"),
+        Pair("新作", "xinzuo")
+    ))
+
+    private open class UriPartFilter(displayName: String, val vals: Array<Pair<String, String>>,
+                                     defaultValue: Int = 0) :
+        Filter.Select<String>(displayName, vals.map { it.first }.toTypedArray(), defaultValue) {
+        open fun toUriPart() = vals[state].second
+    }
 }