From bc1bd6e09ecab268bddf961a3fd0bb29448b9895 Mon Sep 17 00:00:00 2001 From: FlaminSarge Date: Fri, 2 Jul 2021 05:16:21 -0700 Subject: [PATCH] [WPMangaReader, WPMangaStream] Prevent pages that don't have abs:src from being added to the page list (#7940) In a few cases, 'src' would be a literal SVG rather than a URL to the page's image, which would work fine with 'src' but show up as an empty string for 'abs:src' --- .../overrides/wpmangastream/komikstation/src/KomikStation.kt | 2 +- .../eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReader.kt | 2 +- .../tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt | 2 +- .../eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt | 2 +- .../tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/multisrc/overrides/wpmangastream/komikstation/src/KomikStation.kt b/multisrc/overrides/wpmangastream/komikstation/src/KomikStation.kt index 7d131f1b7..7ba4b9899 100644 --- a/multisrc/overrides/wpmangastream/komikstation/src/KomikStation.kt +++ b/multisrc/overrides/wpmangastream/komikstation/src/KomikStation.kt @@ -28,7 +28,7 @@ class KomikStation : WPMangaStream("Komik Station", "https://komikstation.com", override fun pageListParse(document: Document): List { val pages = mutableListOf() document.select(pageSelector) - .filterNot { it.attr("src").isNullOrEmpty() } + .filterNot { it.attr("abs:src").isNullOrEmpty() } .mapIndexed { i, img -> pages.add(Page(i, "", img.attr("abs:src"))) } // Some sites like mangakita now load pages via javascript diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReader.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReader.kt index 9ff001461..c2ae39e62 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReader.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReader.kt @@ -240,7 +240,7 @@ abstract class WPMangaReader( override fun pageListParse(document: Document): List { val pages = mutableListOf() document.select(pageSelector) - .filterNot { it.attr("src").isNullOrEmpty() } + .filterNot { it.attr("abs:src").isNullOrEmpty() } .mapIndexed { i, img -> pages.add(Page(i, "", img.attr("abs:src"))) } // Some sites like mangakita now load pages via javascript diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt index 40782e271..d4e339613 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangareader/WPMangaReaderGenerator.kt @@ -9,7 +9,7 @@ class WPMangaReaderGenerator : ThemeSourceGenerator { override val themeClass = "WPMangaReader" - override val baseVersionCode: Int = 7 + override val baseVersionCode: Int = 8 override val sources = listOf( SingleLang("Kiryuu", "https://kiryuu.id", "id", overrideVersionCode = 1), diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt index 2e35b2b64..18922fb23 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStream.kt @@ -275,7 +275,7 @@ abstract class WPMangaStream( override fun pageListParse(document: Document): List { val htmlPages = document.select(pageSelector) - .filterNot { it.attr("src").isNullOrEmpty() } + .filterNot { it.attr("abs:src").isNullOrEmpty() } .mapIndexed { i, img -> Page(i, "", img.attr("abs:src")) } .toMutableList() diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt index 5b744ec66..8d6692ca0 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt @@ -9,7 +9,7 @@ class WPMangaStreamGenerator : ThemeSourceGenerator { override val themeClass = "WPMangaStream" - override val baseVersionCode: Int = 6 + override val baseVersionCode: Int = 7 override val sources = listOf( SingleLang("Asura Scans", "https://www.asurascans.com", "en", overrideVersionCode = 1),