diff --git a/multisrc/overrides/zeistmanga/asupankomik/src/AsupanKomik.kt b/multisrc/overrides/zeistmanga/asupankomik/src/AsupanKomik.kt index c6806b45e..59ca0e535 100644 --- a/multisrc/overrides/zeistmanga/asupankomik/src/AsupanKomik.kt +++ b/multisrc/overrides/zeistmanga/asupankomik/src/AsupanKomik.kt @@ -4,4 +4,5 @@ import eu.kanade.tachiyomi.multisrc.zeistmanga.ZeistManga class AsupanKomik : ZeistManga("Asupan Komik", "https://www.asupankomik.my.id", "id") { override val hasFilters = true + override val pageListSelector = "div.check-box" } diff --git a/multisrc/overrides/zeistmanga/klmanhua/src/KLManhua.kt b/multisrc/overrides/zeistmanga/klmanhua/src/KLManhua.kt index 72ebe1616..8b34b50b1 100644 --- a/multisrc/overrides/zeistmanga/klmanhua/src/KLManhua.kt +++ b/multisrc/overrides/zeistmanga/klmanhua/src/KLManhua.kt @@ -10,7 +10,4 @@ class KLManhua : ZeistManga("KLManhua", "https://klmanhua.blogspot.com", "id") { override fun getLanguageList(): List = listOf( Language(intl.all, ""), ) - - override val imgSelector = "a[href]" - override val imgSelectorAttr = "href" } diff --git a/multisrc/overrides/zeistmanga/mangaailand/src/MangaAiLand.kt b/multisrc/overrides/zeistmanga/mangaailand/src/MangaAiLand.kt index f7f73850a..406781b85 100644 --- a/multisrc/overrides/zeistmanga/mangaailand/src/MangaAiLand.kt +++ b/multisrc/overrides/zeistmanga/mangaailand/src/MangaAiLand.kt @@ -8,9 +8,6 @@ class MangaAiLand : ZeistManga("Manga Ai Land", "https://manga-ai-land.blogspot. override val hasFilters = true - override val imgSelector = "a[href]" - override val imgSelectorAttr = "href" - override fun getLanguageList(): List = listOf( Language(intl.all, ""), ) diff --git a/multisrc/overrides/zeistmanga/noromax/src/Noromax.kt b/multisrc/overrides/zeistmanga/noromax/src/Noromax.kt index b40c21bbf..3a535ea84 100644 --- a/multisrc/overrides/zeistmanga/noromax/src/Noromax.kt +++ b/multisrc/overrides/zeistmanga/noromax/src/Noromax.kt @@ -5,7 +5,4 @@ import eu.kanade.tachiyomi.multisrc.zeistmanga.ZeistManga class Noromax : ZeistManga("Noromax", "https://www.noromax.xyz", "id") { override val hasFilters = true - - override val imgSelector = "a[href]" - override val imgSelectorAttr = "href" } diff --git a/multisrc/overrides/zeistmanga/shiyurasub/src/ShiyuraSub.kt b/multisrc/overrides/zeistmanga/shiyurasub/src/ShiyuraSub.kt index 082081d0e..38870cc9e 100644 --- a/multisrc/overrides/zeistmanga/shiyurasub/src/ShiyuraSub.kt +++ b/multisrc/overrides/zeistmanga/shiyurasub/src/ShiyuraSub.kt @@ -7,9 +7,6 @@ class ShiyuraSub : ZeistManga("ShiyuraSub", "https://shiyurasub.blogspot.com", " override val hasFilters = true - override val imgSelector = "a[href]" - override val imgSelectorAttr = "href" - override fun getLanguageList(): List = listOf( Language(intl.all, ""), ) diff --git a/multisrc/overrides/zeistmanga/tooncubus/src/Tooncubus.kt b/multisrc/overrides/zeistmanga/tooncubus/src/Tooncubus.kt index b3f78514f..fa681425b 100644 --- a/multisrc/overrides/zeistmanga/tooncubus/src/Tooncubus.kt +++ b/multisrc/overrides/zeistmanga/tooncubus/src/Tooncubus.kt @@ -8,7 +8,9 @@ import eu.kanade.tachiyomi.util.asJsoup import okhttp3.Response import org.jsoup.nodes.Document -class Tooncubus : ZeistManga("Tooncubus", "https://www.tooncubus.site", "id") { +class Tooncubus : ZeistManga("Tooncubus", "https://www.tooncubus.top", "id") { + + override val pageListSelector = "div.check-box center" override fun chapterListParse(response: Response): List { return response.asJsoup().selectFirst("ul.series-chapterlist")!!.select("div.flexch-infoz").map { element -> diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistManga.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistManga.kt index 0eab0982b..42334dfa7 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistManga.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistManga.kt @@ -36,8 +36,7 @@ abstract class ZeistManga( open val oldChapterFeedRegex = """([^']+)\?""".toRegex() open val oldScriptSelector = "#myUL > script" - open val imgSelector = "img[src]" - open val imgSelectorAttr = "src" + open val pageListSelector = "div.check-box div.separator" open fun getApiUrl(doc: Document): String { val script = doc.selectFirst(scriptSelector) @@ -145,9 +144,9 @@ abstract class ZeistManga( } override fun pageListParse(document: Document): List { - val images = document.selectFirst("div.check-box")!! - return images.select(imgSelector).mapIndexed { i, img -> - Page(i, "", img.attr(imgSelectorAttr)) + val images = document.select(pageListSelector) + return images.select("img[src]").mapIndexed { i, img -> + Page(i, "", img.attr("src")) } } diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaGenerator.kt index f653f1ee4..575d77ea2 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/zeistmanga/ZeistMangaGenerator.kt @@ -9,7 +9,7 @@ class ZeistMangaGenerator : ThemeSourceGenerator { override val themeClass = "ZeistManga" - override val baseVersionCode: Int = 5 + override val baseVersionCode: Int = 6 override val sources = listOf( SingleLang("Asupan Komik", "https://www.asupankomik.my.id", "id", overrideVersionCode = 1), @@ -20,7 +20,7 @@ class ZeistMangaGenerator : ThemeSourceGenerator { SingleLang("Muslos No Sekai", "https://muslosnosekai.blogspot.com", "es"), SingleLang("Noromax", "https://www.noromax.xyz", "id"), SingleLang("ShiyuraSub", "https://shiyurasub.blogspot.com", "id"), - SingleLang("Tooncubus", "https://www.tooncubus.site", "id", isNsfw = true), + SingleLang("Tooncubus", "https://www.tooncubus.top", "id", isNsfw = true), ) companion object {