diff --git a/multisrc/overrides/sinmh/manhuadui/res/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/sinmh/manhuadui/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 977fa4f9d..000000000 Binary files a/multisrc/overrides/sinmh/manhuadui/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/sinmh/manhuadui/res/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/sinmh/manhuadui/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 14e1f3d02..000000000 Binary files a/multisrc/overrides/sinmh/manhuadui/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/sinmh/manhuadui/res/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/sinmh/manhuadui/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index bec42bc83..000000000 Binary files a/multisrc/overrides/sinmh/manhuadui/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/sinmh/manhuadui/res/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/sinmh/manhuadui/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 12021be2f..000000000 Binary files a/multisrc/overrides/sinmh/manhuadui/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/sinmh/manhuadui/res/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/sinmh/manhuadui/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 1a8abce6f..000000000 Binary files a/multisrc/overrides/sinmh/manhuadui/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/sinmh/manhuadui/res/web_hi_res_512.png b/multisrc/overrides/sinmh/manhuadui/res/web_hi_res_512.png deleted file mode 100644 index bcaa3f4e4..000000000 Binary files a/multisrc/overrides/sinmh/manhuadui/res/web_hi_res_512.png and /dev/null differ diff --git a/multisrc/overrides/sinmh/manhuadui/src/YKMH.kt b/multisrc/overrides/sinmh/manhuadui/src/YKMH.kt deleted file mode 100644 index 275138de3..000000000 --- a/multisrc/overrides/sinmh/manhuadui/src/YKMH.kt +++ /dev/null @@ -1,14 +0,0 @@ -package eu.kanade.tachiyomi.extension.zh.manhuadui - -import eu.kanade.tachiyomi.multisrc.sinmh.SinMH -import eu.kanade.tachiyomi.source.model.SChapter -import org.jsoup.nodes.Document - -class YKMH : SinMH("优酷漫画", "http://www.ykmh.com") { - override val id = 1637952806167036168 - override val mobileUrl = "http://wap.ykmh.com" - - override fun mangaDetailsParse(document: Document) = mangaDetailsParseDMZJStyle(document, hasBreadcrumb = false) - - override fun List<SChapter>.sortedDescending() = this -} diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/sinmh/SinMH.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/sinmh/SinMH.kt index d099fda7b..057c2d795 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/sinmh/SinMH.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/sinmh/SinMH.kt @@ -120,8 +120,10 @@ abstract class SinMH( protected open fun mangaDetailsParseDefaultGenre(document: Document, detailsList: Element): String { val category = detailsList.selectFirst("strong:contains(类型) + a") val breadcrumbs = document.selectFirst("div.breadcrumb-bar").select("a[href^=/list/]") - breadcrumbs.add(0, category) - return breadcrumbs.joinToString(", ") { it.text() } + return buildString { + append(category) + breadcrumbs.map(Element::text).filter(String::isNotEmpty).joinTo(this, prefix = ", ") + } } protected fun mangaDetailsParseDMZJStyle(document: Document, hasBreadcrumb: Boolean) = SManga.create().apply { diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/sinmh/SinMHGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/sinmh/SinMHGenerator.kt index f4d3e2715..a9684ae26 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/sinmh/SinMHGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/sinmh/SinMHGenerator.kt @@ -6,7 +6,7 @@ import generator.ThemeSourceGenerator class SinMHGenerator : ThemeSourceGenerator { override val themeClass = "SinMH" override val themePkg = "sinmh" - override val baseVersionCode = 6 + override val baseVersionCode = 7 override val sources = listOf( SingleLang( name = "Gufeng Manhua", baseUrl = "https://www.gufengmh9.com", lang = "zh", @@ -16,10 +16,6 @@ class SinMHGenerator : ThemeSourceGenerator { name = "Imitui Manhua", baseUrl = "https://www.imitui.com", lang = "zh", className = "Imitui", sourceName = "爱米推漫画", overrideVersionCode = 2 ), - SingleLang( - name = "YKMH", baseUrl = "http://www.ykmh.com", lang = "zh", className = "YKMH", - pkgName = "manhuadui", sourceName = "优酷漫画", overrideVersionCode = 17 - ), SingleLang( name = "Qinqin Manhua", baseUrl = "https://www.acgqd.com", lang = "zh", className = "Qinqin", sourceName = "亲亲漫画", overrideVersionCode = 1