diff --git a/lib-multisrc/madara/src/eu/kanade/tachiyomi/multisrc/madara/Madara.kt b/lib-multisrc/madara/src/eu/kanade/tachiyomi/multisrc/madara/Madara.kt index 4f7d0bf40..2df823e80 100644 --- a/lib-multisrc/madara/src/eu/kanade/tachiyomi/multisrc/madara/Madara.kt +++ b/lib-multisrc/madara/src/eu/kanade/tachiyomi/multisrc/madara/Madara.kt @@ -979,6 +979,8 @@ abstract class Madara( open val pageListParseSelector = "div.page-break, li.blocks-gallery-item, .reading-content .text-left:not(:has(.blocks-gallery-item)) img" open val chapterProtectorSelector = "#chapter-protector-data" + open val chapterProtectorPasswordPrefix = "wpmangaprotectornonce='" + open val chapterProtectorDataPrefix = "chapter_data='" override fun pageListParse(document: Document): List { launchIO { countViews(document) } @@ -994,11 +996,11 @@ abstract class Madara( ?.let { Base64.decode(it, Base64.DEFAULT).toString(Charsets.UTF_8) } ?: chapterProtector.html() val password = chapterProtectorHtml - .substringAfter("wpmangaprotectornonce='") + .substringAfter(chapterProtectorPasswordPrefix) .substringBefore("';") val chapterData = json.parseToJsonElement( chapterProtectorHtml - .substringAfter("chapter_data='") + .substringAfter(chapterProtectorDataPrefix) .substringBefore("';") .replace("\\/", "/"), ).jsonObject diff --git a/src/es/catharsisworld/build.gradle b/src/es/catharsisworld/build.gradle index f77b5dda2..85c3d1ffb 100644 --- a/src/es/catharsisworld/build.gradle +++ b/src/es/catharsisworld/build.gradle @@ -3,7 +3,7 @@ ext { extClass = '.CatharsisWorld' themePkg = 'madara' baseUrl = 'https://catharsisworld.dig-it.info' - overrideVersionCode = 2 + overrideVersionCode = 3 isNsfw = true } diff --git a/src/es/catharsisworld/src/eu/kanade/tachiyomi/extension/es/catharsisworld/CatharsisWorld.kt b/src/es/catharsisworld/src/eu/kanade/tachiyomi/extension/es/catharsisworld/CatharsisWorld.kt index 23c73912a..b22447d6b 100644 --- a/src/es/catharsisworld/src/eu/kanade/tachiyomi/extension/es/catharsisworld/CatharsisWorld.kt +++ b/src/es/catharsisworld/src/eu/kanade/tachiyomi/extension/es/catharsisworld/CatharsisWorld.kt @@ -51,6 +51,9 @@ class CatharsisWorld : Madara( setUrlWithoutDomain(element.selectFirst("a")!!.attr("href")) } + override val chapterProtectorPasswordPrefix = "protectornonce='" + override val chapterProtectorDataPrefix = "_data='" + private fun Element.imageFromStyle(): String { return this.attr("style").substringAfter("url(").substringBefore(")") }