From 5d669e79a3e00a37648141f3b5f109bac99156cc Mon Sep 17 00:00:00 2001 From: Logan B Date: Fri, 8 Feb 2019 10:19:02 +1300 Subject: [PATCH] Fix Jaimini's Box, fixes #777 (#781) Fix Jaimini's Box, fixes #777 --- src/all/foolslide/build.gradle | 2 +- .../tachiyomi/extension/en/foolslide/FoolSlideFactory.kt | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/all/foolslide/build.gradle b/src/all/foolslide/build.gradle index ec376c2d8..36c830681 100644 --- a/src/all/foolslide/build.gradle +++ b/src/all/foolslide/build.gradle @@ -5,7 +5,7 @@ ext { appName = 'Tachiyomi: FoolSlide' pkgNameSuffix = "all.foolslide" extClass = '.FoolSlideFactory' - extVersionCode = 15 + extVersionCode = 16 libVersion = '1.2' } diff --git a/src/all/foolslide/src/eu/kanade/tachiyomi/extension/en/foolslide/FoolSlideFactory.kt b/src/all/foolslide/src/eu/kanade/tachiyomi/extension/en/foolslide/FoolSlideFactory.kt index 259e8f01c..e025b4639 100644 --- a/src/all/foolslide/src/eu/kanade/tachiyomi/extension/en/foolslide/FoolSlideFactory.kt +++ b/src/all/foolslide/src/eu/kanade/tachiyomi/extension/en/foolslide/FoolSlideFactory.kt @@ -58,9 +58,12 @@ class JaminisBox : FoolSlide("Jaimini's Box", "https://jaiminisbox.com", "en", " override fun pageListParse(document: Document): List { val doc = document.toString() - val base64Json = doc.substringAfter("JSON.parse(atob(\"").substringBefore("\"));") - val decodeJson = String(Base64.decode(base64Json, Base64.DEFAULT)) - val json = JsonParser().parse(decodeJson).asJsonArray + var jsonstr = doc.substringAfter("var pages = ").substringBefore(";") + if (jsonstr.contains("JSON.parse")) { + val base64Json = jsonstr.substringAfter("JSON.parse(atob(\"").substringBefore("\"));") + jsonstr = String(Base64.decode(base64Json, Base64.DEFAULT)) + } + val json = JsonParser().parse(jsonstr).asJsonArray val pages = mutableListOf() json.forEach { pages.add(Page(pages.size, "", it["url"].asString))