diff --git a/multisrc/overrides/madara/manga68/src/Manga68.kt b/multisrc/overrides/madara/manga68/src/Manga68.kt deleted file mode 100644 index b7b03fced..000000000 --- a/multisrc/overrides/madara/manga68/src/Manga68.kt +++ /dev/null @@ -1,7 +0,0 @@ -package eu.kanade.tachiyomi.extension.en.manga68 - -import eu.kanade.tachiyomi.multisrc.madara.Madara - -class Manga68 : Madara("Manga68", "https://manga68.com", "en") { - override val pageListParseSelector = "div.page-break, div.text-left p" -} diff --git a/multisrc/overrides/madara/mangachill/src/MangaChill.kt b/multisrc/overrides/madara/mangachill/src/MangaChill.kt index 7d35b9d9f..f381eb88e 100644 --- a/multisrc/overrides/madara/mangachill/src/MangaChill.kt +++ b/multisrc/overrides/madara/mangachill/src/MangaChill.kt @@ -7,4 +7,3 @@ import java.util.Locale class MangaChill : Madara("Manga Chill", "https://mangachill.com", "en", SimpleDateFormat("dd/MM/yyyy", Locale.US)) { override val useNewChapterEndpoint: Boolean = true } - diff --git a/multisrc/overrides/madara/mangakitsune/src/MangaKitsune.kt b/multisrc/overrides/madara/mangakitsune/src/MangaKitsune.kt index a5468302b..2c42f84cb 100644 --- a/multisrc/overrides/madara/mangakitsune/src/MangaKitsune.kt +++ b/multisrc/overrides/madara/mangakitsune/src/MangaKitsune.kt @@ -10,8 +10,6 @@ class MangaKitsune : Madara("MangaKitsune", "https://mangakitsune.com", "en", da override fun chapterListParse(response: Response): List = super.chapterListParse(response).reversed() - override val pageListParseSelector = ".reading-content div.text-left :has(>img)" - override fun getGenreList() = listOf( Genre("Action", "action"), Genre("Adult", "adult"), diff --git a/multisrc/overrides/madara/manhuabox/mipmap-hdpi/ic_launcher.png b/multisrc/overrides/madara/manhuabox/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 4cb2f71ac..000000000 Binary files a/multisrc/overrides/madara/manhuabox/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/manhuabox/mipmap-mdpi/ic_launcher.png b/multisrc/overrides/madara/manhuabox/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 839ee6548..000000000 Binary files a/multisrc/overrides/madara/manhuabox/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/manhuabox/mipmap-xhdpi/ic_launcher.png b/multisrc/overrides/madara/manhuabox/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index f68802760..000000000 Binary files a/multisrc/overrides/madara/manhuabox/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/manhuabox/mipmap-xxhdpi/ic_launcher.png b/multisrc/overrides/madara/manhuabox/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index c5d731523..000000000 Binary files a/multisrc/overrides/madara/manhuabox/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/manhuabox/mipmap-xxxhdpi/ic_launcher.png b/multisrc/overrides/madara/manhuabox/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 1e46ccad3..000000000 Binary files a/multisrc/overrides/madara/manhuabox/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/multisrc/overrides/madara/manhuabox/src/ManhuaBox.kt b/multisrc/overrides/madara/manhuabox/src/ManhuaBox.kt deleted file mode 100644 index f0bec66ef..000000000 --- a/multisrc/overrides/madara/manhuabox/src/ManhuaBox.kt +++ /dev/null @@ -1,7 +0,0 @@ -package eu.kanade.tachiyomi.extension.en.manhuabox - -import eu.kanade.tachiyomi.multisrc.madara.Madara - -class ManhuaBox : Madara("ManhuaBox", "https://manhuabox.net", "en") { - override val pageListParseSelector = "div.page-break, div.text-left p img" -} diff --git a/multisrc/overrides/madara/manhuabox/web_hi_res_512.png b/multisrc/overrides/madara/manhuabox/web_hi_res_512.png deleted file mode 100644 index 30756bb7d..000000000 Binary files a/multisrc/overrides/madara/manhuabox/web_hi_res_512.png and /dev/null differ diff --git a/multisrc/overrides/madara/manhuaes/src/ManhuaES.kt b/multisrc/overrides/madara/manhuaes/src/ManhuaES.kt index d2b05d6fb..666478bfc 100644 --- a/multisrc/overrides/madara/manhuaes/src/ManhuaES.kt +++ b/multisrc/overrides/madara/manhuaes/src/ManhuaES.kt @@ -7,8 +7,6 @@ import eu.kanade.tachiyomi.util.asJsoup import okhttp3.Response class ManhuaES : Madara("Manhua ES", "https://manhuaes.com", "en") { - override val pageListParseSelector = ".reading-content div.text-left :has(>img)" - override fun chapterListParse(response: Response): List { var chapterList = super.chapterListParse(response) diff --git a/multisrc/overrides/madara/rh2plusmanga/src/Rh2PlusManga.kt b/multisrc/overrides/madara/rh2plusmanga/src/Rh2PlusManga.kt index 31a331002..3c651c8fc 100644 --- a/multisrc/overrides/madara/rh2plusmanga/src/Rh2PlusManga.kt +++ b/multisrc/overrides/madara/rh2plusmanga/src/Rh2PlusManga.kt @@ -43,8 +43,6 @@ class Rh2PlusManga : Madara("Rh2PlusManga", "https://www.rh2plusmanga.com", "th" Genre("ลามก", "ecchi") ) - override val pageListParseSelector = "div.reading-content p code img" - override fun pageListParse(document: Document): List { countViews(document) diff --git a/multisrc/overrides/madara/shieldmanga/src/ShieldManga.kt b/multisrc/overrides/madara/shieldmanga/src/ShieldManga.kt index b623fa067..c24f51268 100644 --- a/multisrc/overrides/madara/shieldmanga/src/ShieldManga.kt +++ b/multisrc/overrides/madara/shieldmanga/src/ShieldManga.kt @@ -16,5 +16,4 @@ class ShieldManga : Madara("Shield Manga", "https://shieldmanga.club", "en") { override fun chapterListSelector() = "li.wp-manga-hapter, .version-chap li" - override val pageListParseSelector = "div.page-beak, .reading-content div" } diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt index 4beb425b5..ba897a022 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt @@ -574,7 +574,7 @@ abstract class Madara( return super.pageListRequest(chapter) } - open val pageListParseSelector = "div.page-break, li.blocks-gallery-item" + open val pageListParseSelector = "div.page-break, li.blocks-gallery-item, .reading-content .text-left:not(:has(.blocks-gallery-item)) :has(>img)" override fun pageListParse(document: Document): List { countViews(document) diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt index 8e209fd84..ef15e969f 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt @@ -10,7 +10,7 @@ class MadaraGenerator : ThemeSourceGenerator { override val themeClass = "Madara" - override val baseVersionCode: Int = 11 + override val baseVersionCode: Int = 12 override val sources = listOf( MultiLang("Leviatan Scans", "https://leviatanscans.com", listOf("en", "es"), className = "LeviatanScansFactory", overrideVersionCode = 9),