Rollback to old popular selector in some Madara sources (#10981)

* Rollback to old popular selector in some Madara sources.

* Readd MadaraGenerator.run.xml.

* Rollback Hentai Manga and MangaGreat.

* Rollback ManyToon.me.

* Rollback more sources.

multisrc/overrides/madara/bananamecanica/src/BananaCitrica.kt

@@ -20,5 +20,4 @@ class BananaCitrica : Madara(
     override val client: OkHttpClient = super.client.newBuilder()
         .addInterceptor(RateLimitInterceptor(1, 2, TimeUnit.SECONDS))
         .build()
-
 }

multisrc/overrides/madara/egymanga/src/EGYManga.kt

@@ -6,7 +6,19 @@ import okhttp3.Response
 import java.text.SimpleDateFormat
 import java.util.Locale
 
-class EGYManga : Madara("EGY Manga", "https://egymanga.net", "ar", SimpleDateFormat("MMMM dd, yyyy", Locale("ar"))) {
+class EGYManga : Madara(
-    override fun chapterListParse(response: Response): List<SChapter> = super.chapterListParse(response).reversed()
+    "EGY Manga",
+    "https://egymanga.net",
+    "ar",
+    SimpleDateFormat("MMMM dd, yyyy", Locale("ar"))
+) {
+
     override val pageListParseSelector = "div.separator"
+
+    // The website does not flag the content, so we just use the old selector.
+    override fun popularMangaSelector() =
+        "div.page-item-detail:not(:has(a[href*='bilibilicomics.com']))"
+
+    override fun chapterListParse(response: Response): List<SChapter> =
+        super.chapterListParse(response).reversed()
 }

multisrc/overrides/madara/gemanga/src/Gemanga.kt

@@ -0,0 +1,9 @@
+package eu.kanade.tachiyomi.extension.ar.gemanga
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Gemanga : Madara("Gemanga", "https://gemanga.com", "ar") {
+
+    // The website does not flag the content, so we just use the old selector.
+    override fun popularMangaSelector() = "div.page-item-detail:not(:has(a[href*='bilibilicomics.com']))"
+}

multisrc/overrides/madara/hattorimanga/src/HattoriManga.kt

@@ -6,7 +6,6 @@ import org.jsoup.nodes.Document
 import java.text.SimpleDateFormat
 import java.util.Locale
 
-
 class HattoriManga : Madara(
     "Hattori Manga",
     "https://hattorimanga.com",

multisrc/overrides/madara/hentaimanga/src/HentaiManga.kt

@@ -9,4 +9,8 @@ class HentaiManga : Madara(
     "https://hentaimanga.me",
     "en",
     dateFormat = SimpleDateFormat("MMM d, yyyy", Locale.US)
-)
+) {
+
+    // The website does not flag the content, so we just use the old selector.
+    override fun popularMangaSelector() = "div.page-item-detail:not(:has(a[href*='bilibilicomics.com']))"
+}

multisrc/overrides/madara/hentaiwebtoon/src/HentaiWebtoon.kt

@@ -0,0 +1,9 @@
+package eu.kanade.tachiyomi.extension.en.hentaiwebtoon
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class HentaiWebtoon : Madara("HentaiWebtoon", "https://hentaiwebtoon.com", "en") {
+
+    // The website does not flag the content, so we just use the old selector.
+    override fun popularMangaSelector() = "div.page-item-detail:not(:has(a[href*='bilibilicomics.com']))"
+}

multisrc/overrides/madara/mangacim/src/Mangacim.kt

@@ -4,7 +4,6 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 import java.text.SimpleDateFormat
 import java.util.Locale
 
-
 class Mangacim : Madara(
     "Mangacim",
     "https://www.mangacim.com",

multisrc/overrides/madara/mangagreat/src/MangaGreat.kt

@@ -0,0 +1,9 @@
+package eu.kanade.tachiyomi.extension.en.mangagreat
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class MangaGreat : Madara("MangaGreat", "https://mangagreat.com", "en") {
+
+    // The website does not flag the content, so we just use the old selector.
+    override fun popularMangaSelector() = "div.page-item-detail:not(:has(a[href*='bilibilicomics.com']))"
+}

multisrc/overrides/madara/mangakeyfi/src/MangaKeyfi.kt

@@ -4,7 +4,6 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 import java.text.SimpleDateFormat
 import java.util.Locale
 
-
 class MangaKeyfi : Madara(
     "Manga Keyfi",
     "https://mangakeyfi.net",

multisrc/overrides/madara/mangasehri/src/MangaSehri.kt

@@ -4,7 +4,6 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 import java.text.SimpleDateFormat
 import java.util.Locale
 
-
 class MangaSehri : Madara(
     "Manga Şehri",
     "https://mangasehri.com",

multisrc/overrides/madara/manhuaes/src/ManhuaES.kt

@@ -7,6 +7,12 @@ import eu.kanade.tachiyomi.util.asJsoup
 import okhttp3.Response
 
 class ManhuaES : Madara("Manhua ES", "https://manhuaes.com", "en") {
+
+    // The website is incorrectly flagging a lot of their
+    // manga content as video and text instead. To bypass this, we
+    // use the old selector that includes all.
+    override fun popularMangaSelector() = "div.page-item-detail:not(:has(a[href*='bilibilicomics.com']))"
+
     override fun chapterListParse(response: Response): List<SChapter> {
         var chapterList = super.chapterListParse(response)
 

multisrc/overrides/madara/manhuaplus/src/ManhuaPlus.kt

@@ -3,5 +3,11 @@ package eu.kanade.tachiyomi.extension.en.manhuaplus
 import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class ManhuaPlus : Madara("Manhua Plus", "https://manhuaplus.com", "en") {
+
+    // The website is incorrectly flagging a lot of their
+    // manga content as video instead. To bypass this, we
+    // use the old selector that includes all.
+    override fun popularMangaSelector() = "div.page-item-detail:not(:has(a[href*='bilibilicomics.com']))"
+
     override val pageListParseSelector = ".read-container img"
 }

multisrc/overrides/madara/manhuaus/src/ManhuaUS.kt

@@ -4,4 +4,9 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 
 class ManhuaUS : Madara("ManhuaUS", "https://manhuaus.com", "en") {
     override val useNewChapterEndpoint: Boolean = true
+
+    // The website is incorrectly flagging a lot of their
+    // manga content as text instead. To bypass this, we
+    // use the old selector that includes all.
+    override fun popularMangaSelector() = "div.page-item-detail:not(:has(a[href*='bilibilicomics.com']))"
 }

multisrc/overrides/madara/manhwa18org/src/Manhwa18Org.kt

@@ -0,0 +1,9 @@
+package eu.kanade.tachiyomi.extension.en.manhwa18org
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Manhwa18Org : Madara("Manhwa18.org", "https://manhwa18.org", "en") {
+
+    // The website does not flag the content, so we just use the old selector.
+    override fun popularMangaSelector() = "div.page-item-detail:not(:has(a[href*='bilibilicomics.com']))"
+}

multisrc/overrides/madara/manhwa68/src/Manhwa68.kt

@@ -9,4 +9,8 @@ class Manhwa68 : Madara(
     "https://manhwa68.com",
     "en",
     dateFormat = SimpleDateFormat("MMM d, yyyy", Locale.US)
-)
+) {
+
+    // The website does not flag the content, so we just use the old selector.
+    override fun popularMangaSelector() = "div.page-item-detail:not(:has(a[href*='bilibilicomics.com']))"
+}

multisrc/overrides/madara/manhwatop/src/Manhwatop.kt

@@ -0,0 +1,9 @@
+package eu.kanade.tachiyomi.extension.en.manhwatop
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Manhwatop : Madara("Manhwatop", "https://manhwatop.com", "en") {
+
+    // The website does not flag the content, so we just use the old selector.
+    override fun popularMangaSelector() = "div.page-item-detail:not(:has(a[href*='bilibilicomics.com']))"
+}

multisrc/overrides/madara/manytoonme/src/ManyToonMe.kt

@@ -5,4 +5,7 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 class ManyToonMe : Madara("ManyToon.me", "https://manytoon.me", "en") {
 
     override val useNewChapterEndpoint: Boolean = true
+
+    // The website does not flag the content, so we just use the old selector.
+    override fun popularMangaSelector() = "div.page-item-detail:not(:has(a[href*='bilibilicomics.com']))"
 }

multisrc/overrides/madara/monarcamanga/src/MonarcaManga.kt

@@ -4,7 +4,6 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 import java.text.SimpleDateFormat
 import java.util.Locale
 
-
 class MonarcaManga : Madara(
     "MonarcaManga",
     "https://monarcamanga.com",

multisrc/overrides/madara/shieldmanga/src/ShieldManga.kt

@@ -5,7 +5,7 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 import okhttp3.OkHttpClient
 import java.util.concurrent.TimeUnit
 
-class ShieldManga : Madara("Shield Manga", "https://shieldmanga.club", "en") {
+class ShieldManga : Madara("Shield Manga", "https://shieldmanga.io", "en") {
     private val rateLimitInterceptor = RateLimitInterceptor(1)
 
     override val client: OkHttpClient = network.cloudflareClient.newBuilder()
@@ -14,5 +14,9 @@ class ShieldManga : Madara("Shield Manga", "https://shieldmanga.club", "en") {
         .addNetworkInterceptor(rateLimitInterceptor)
         .build()
 
+    // The website does not flag the content, so we just use the old selector.
+    override fun popularMangaSelector() =
+        "div.page-item-detail:not(:has(a[href*='bilibilicomics.com']))"
+
     override fun chapterListSelector() = "li.wp-manga-hapter, .version-chap li"
 }

multisrc/overrides/madara/webtoontr/src/WebtoonTR.kt

@@ -4,7 +4,6 @@ import eu.kanade.tachiyomi.multisrc.madara.Madara
 import java.text.SimpleDateFormat
 import java.util.Locale
 
-
 class WebtoonTR : Madara(
     "Webtoon TR",
     "https://webtoon-tr.com",

multisrc/overrides/madara/yetiskinruyamanga/src/YetiskinRuyaManga.kt

@@ -6,7 +6,6 @@ import org.jsoup.nodes.Document
 import java.text.SimpleDateFormat
 import java.util.Locale
 
-
 class YetiskinRuyaManga : Madara(
     "Yetişkin Rüya Manga",
     "https://yetiskin.ruyamanga.com",

multisrc/overrides/madara/zinmanga/src/Zinmanga.kt

@@ -0,0 +1,9 @@
+package eu.kanade.tachiyomi.extension.en.zinmanga
+
+import eu.kanade.tachiyomi.multisrc.madara.Madara
+
+class Zinmanga : Madara("Zinmanga", "https://zinmanga.com", "en") {
+
+    // The website does not flag the content, so we just use the old selector.
+    override fun popularMangaSelector() = "div.page-item-detail:not(:has(a[href*='bilibilicomics.com']))"
+}

multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt

@@ -85,7 +85,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("Dream Manga", "https://en.ruyamanga.com", "en", overrideVersionCode = 2),
         SingleLang("Dream Union Scan", "https://www.dreamunionscan.com", "pt-BR", overrideVersionCode = 2),
         SingleLang("Drope Scan", "https://dropescan.com", "pt-BR", overrideVersionCode = 4),
-        SingleLang("EGY Manga", "https://egymanga.net", "ar"),
+        SingleLang("EGY Manga", "https://egymanga.net", "ar", overrideVersionCode = 1),
         SingleLang("Empire Webtoon", "https://webtoonempire.com", "ar", isNsfw = true),
         SingleLang("Eromanhwas", "https://eromanhwas.com", "en"),
         SingleLang("Esomanga", "http://esomanga.com", "tr"),
@@ -103,7 +103,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("Furio Scans", "https://furioscans.com", "pt-BR", overrideVersionCode = 4),
         SingleLang("GalaxyDegenScans", "https://gdstmp.site", "en", overrideVersionCode = 3),
         SingleLang("Gatemanga", "https://gatemanga.com", "ar", overrideVersionCode = 1),
-        SingleLang("Gemanga", "https://gemanga.com", "ar", overrideVersionCode = 1),
+        SingleLang("Gemanga", "https://gemanga.com", "ar", overrideVersionCode = 2),
         SingleLang("Glass Sky", "https://glasscan.online", "pt-BR"),
         SingleLang("Gogoscans", "https://www.gogoscans.com", "en"),
         SingleLang("Goof Fansub", "https://gooffansub.com", "pt-BR", isNsfw = true),
@@ -115,11 +115,11 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("Hattori Manga", "https://hattorimanga.com", "tr", isNsfw = true),
         SingleLang("Hayalistic", "https://hayalistic.com", "tr"),
         SingleLang("Hentai Cube", "https://hentaicube.net", "vi", isNsfw = true),
-        SingleLang("Hentai Manga", "https://hentaimanga.me", "en", isNsfw = true),
+        SingleLang("Hentai Manga", "https://hentaimanga.me", "en", isNsfw = true, overrideVersionCode = 1),
         SingleLang("Hentai Teca", "https://hentaiteca.net", "pt-BR", isNsfw = true),
         SingleLang("Hentai20", "https://hentai20.com", "en", isNsfw = true, overrideVersionCode = 1),
         SingleLang("HentaiRead", "https://hentairead.com", "en", isNsfw = true, className = "Hentairead", overrideVersionCode = 2),
-        SingleLang("HentaiWebtoon", "https://hentaiwebtoon.com", "en", isNsfw = true),
+        SingleLang("HentaiWebtoon", "https://hentaiwebtoon.com", "en", isNsfw = true, overrideVersionCode = 1),
         SingleLang("HentaiXComic", "https://hentaixcomic.com", "en", isNsfw = true),
         SingleLang("HentaiXYuri", "https://hentaixyuri.com", "en", isNsfw = true),
         SingleLang("HentaiZone", "https://hentaizone.xyz", "fr", isNsfw = true),
@@ -234,7 +234,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("MangaFort", "https://mangafort.com", "en", overrideVersionCode = 1),
         SingleLang("MangaFoxFull", "https://mangafoxfull.com", "en"),
         SingleLang("MangaGG", "https://mangagg.com", "en", overrideVersionCode = 2),
-        SingleLang("MangaGreat", "https://mangagreat.com", "en", overrideVersionCode = 2),
+        SingleLang("MangaGreat", "https://mangagreat.com", "en", overrideVersionCode = 3),
         SingleLang("MangaHZ", "https://www.mangahz.com", "en", isNsfw = true, overrideVersionCode = 2),
         SingleLang("MangaKitsune", "https://mangakitsune.com", "en", isNsfw = true, overrideVersionCode = 4),
         SingleLang("MangaKomi", "https://mangakomi.com", "en", overrideVersionCode = 4),
@@ -280,8 +280,8 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("Mangceh", "https://mangceh.me", "id", isNsfw = true, overrideVersionCode = 3),
         SingleLang("Manhatic", "https://manhatic.com", "ar", isNsfw = true),
         SingleLang("Manhua Dragon", "https://manhuadragon.com", "en"),
-        SingleLang("Manhua ES", "https://manhuaes.com", "en", overrideVersionCode = 5),
+        SingleLang("Manhua ES", "https://manhuaes.com", "en", overrideVersionCode = 6),
-        SingleLang("Manhua Plus", "https://manhuaplus.com", "en", overrideVersionCode = 5),
+        SingleLang("Manhua Plus", "https://manhuaplus.com", "en", overrideVersionCode = 6),
         SingleLang("Manhua SY", "https://www.manhuasy.com", "en", overrideVersionCode = 1),
         SingleLang("ManhuaBox", "https://manhuabox.net", "en", overrideVersionCode = 2),
         SingleLang("ManhuaChill", "https://manhuachill.com", "en"),
@@ -292,7 +292,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("ManhuaHot", "https://manhuahot.com", "en"),
         SingleLang("ManhuaPro", "https://manhuapro.com", "en", overrideVersionCode = 2),
         SingleLang("ManhuaToon", "https://manhuatoon.com", "en"),
-        SingleLang("ManhuaUS", "https://manhuaus.com", "en", overrideVersionCode = 4),
+        SingleLang("ManhuaUS", "https://manhuaus.com", "en", overrideVersionCode = 5),
         SingleLang("ManhuaZone", "https://manhuazone.com", "en"),
         SingleLang("Manhuaga", "https://manhuaga.com", "en", overrideVersionCode = 2),
         SingleLang("Manhualo", "https://manhualo.com", "en", overrideVersionCode = 1),
@@ -301,9 +301,9 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("Manhwa Raw", "https://manhwaraw.com", "ko", isNsfw = true, overrideVersionCode = 1),
         SingleLang("Manhwa.biz", "https://manhwa.biz", "en", isNsfw = true, className = "Manhwabiz"),
         SingleLang("Manhwa18.app", "https://manhwa18.app", "en", isNsfw = true, className = "Manhwa18app"),
-        SingleLang("Manhwa18.org", "https://manhwa18.org", "en", isNsfw = true, className = "Manhwa18Org", overrideVersionCode = 1),
+        SingleLang("Manhwa18.org", "https://manhwa18.org", "en", isNsfw = true, className = "Manhwa18Org", overrideVersionCode = 2),
         SingleLang("Manhwa365", "https://manhwa365.com", "en", isNsfw = true),
-        SingleLang("Manhwa68", "https://manhwa68.com", "en", isNsfw = true, overrideVersionCode = 2),
+        SingleLang("Manhwa68", "https://manhwa68.com", "en", isNsfw = true, overrideVersionCode = 3),
         SingleLang("ManhwaBookShelf", "https://manhwabookshelf.com", "en"),
         SingleLang("ManhwaNelo", "https://manhwanelo.com", "en", overrideVersionCode = 2),
         SingleLang("ManhwaTime", "https://manhwatime.com", "ar"),
@@ -312,11 +312,11 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("Manhwafull", "https://manhwafull.com", "en"),
         SingleLang("Manhwahentai.me", "https://manhwahentai.me", "en", className = "ManhwahentaiMe", isNsfw = true, overrideVersionCode = 2),
         SingleLang("Manhwaraw.net", "https://manhwaraw.net", "en", className = "Manhwarawnet"),
-        SingleLang("Manhwatop", "https://manhwatop.com", "en", overrideVersionCode = 1),
+        SingleLang("Manhwatop", "https://manhwatop.com", "en", overrideVersionCode = 2),
         SingleLang("Manhwua.fans", "https://manhwua.fans", "en", isNsfw = true, className = "Manhwuafans"),
         SingleLang("ManyComic", "https://manycomic.com", "en", isNsfw = true, overrideVersionCode = 1),
         SingleLang("ManyToon", "https://manytoon.com", "en", isNsfw = true, overrideVersionCode = 4),
-        SingleLang("ManyToon.me", "https://manytoon.me", "en", isNsfw = true, className = "ManyToonMe", overrideVersionCode = 3),
+        SingleLang("ManyToon.me", "https://manytoon.me", "en", isNsfw = true, className = "ManyToonMe", overrideVersionCode = 4),
         SingleLang("ManyToonClub", "https://manytoon.club", "ko", isNsfw = true, overrideVersionCode = 1),
         SingleLang("Mark Scans", "https://markscans.online", "pt-BR", overrideVersionCode = 3),
         SingleLang("Meraki Scan", "https://meraki801.com", "es", isNsfw = true),
@@ -387,7 +387,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("Seikou Scans", "https://seikouscans.com", "pt-BR", isNsfw = true, overrideVersionCode = 2),
         SingleLang("Sensaina Yuri", "https://sensainayuri.dropescan.com", "pt-BR", isNsfw = true, overrideVersionCode = 2),
         SingleLang("Setsu Scans", "https://setsuscans.com", "en", overrideVersionCode = 2),
-        SingleLang("Shield Manga", "https://shieldmanga.club", "en", overrideVersionCode = 2),
+        SingleLang("Shield Manga", "https://shieldmanga.io", "en", overrideVersionCode = 3),
         SingleLang("ShinobiScans", "https://shinobiscans.com", "it"),
         SingleLang("ShoujoHearts", "https://shoujohearts.com", "en", overrideVersionCode = 2),
         SingleLang("SiXiang Scans", "http://www.sixiangscans.com", "en", overrideVersionCode = 1),
@@ -461,7 +461,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("Yetişkin Rüya Manga", "https://yetiskin.ruyamanga.com", "tr", isNsfw = true, className = "YetiskinRuyaManga"),
         SingleLang("YonaBar", "https://yonabar.net", "ar", isNsfw = true, overrideVersionCode = 1),
         SingleLang("Yuri Verso", "https://yuri.live", "pt-BR", overrideVersionCode = 3),
-        SingleLang("Zinmanga", "https://zinmanga.com", "en"),
+        SingleLang("Zinmanga", "https://zinmanga.com", "en", overrideVersionCode = 1),
         SingleLang("Zinmanhwa", "https://zinmanhwa.com", "en"),
         SingleLang("ZuttoManga", "https://zuttomanga.com", "en", overrideVersionCode = 1),
         SingleLang("hManhwa", "https://hmanhwa.com", "en", isNsfw = true, overrideVersionCode = 1),