Draff
/
Tachiyomi-Extensions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JB page list fix. (#2776) 

JB page list fix.
This commit is contained in:
funkyhippo 2020-04-23 09:45:32 -07:00 committed by GitHub
parent f2a119ac0c
commit 7a1663b21c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/all/foolslide/build.gradle
View File

@ -5,7 +5,7 @@ ext {
appName = 'Tachiyomi: FoolSlide (multiple sources)' appName = 'Tachiyomi: FoolSlide (multiple sources)'
pkgNameSuffix = 'all.foolslide' pkgNameSuffix = 'all.foolslide'
extClass = '.FoolSlideFactory' extClass = '.FoolSlideFactory'
extVersionCode = 37 extVersionCode = 38
libVersion = '1.2' libVersion = '1.2'
} }

23
src/all/foolslide/src/eu/kanade/tachiyomi/extension/all/foolslide/FoolSlideFactory.kt
View File

@ -7,8 +7,10 @@ import eu.kanade.tachiyomi.network.GET
import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.source.SourceFactory import eu.kanade.tachiyomi.source.SourceFactory
import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.Page
import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import okhttp3.Request import okhttp3.Request
import org.json.JSONObject
import org.jsoup.nodes.Document import org.jsoup.nodes.Document
class FoolSlideFactory : SourceFactory { class FoolSlideFactory : SourceFactory {
@ -42,17 +44,20 @@ class FoolSlideFactory : SourceFactory {
} }
class JaminisBox : FoolSlide("Jaimini's Box", "https://jaiminisbox.com", "en", "/reader") { class JaminisBox : FoolSlide("Jaimini's Box", "https://jaiminisbox.com", "en", "/reader") {
override fun pageListParse(document: Document): List<Page> { val SLUG_REGEX = "(?:/read/)([\\w\\d-]+?)(?:/)".toRegex()
val doc = document.toString() override fun pageListRequest(chapter: SChapter): Request {
var jsonstr = doc.substringAfter("var pages = ").substringBefore(";") val (slug) = SLUG_REGEX.find(chapter.url)!!.destructured
if (jsonstr.contains("JSON.parse")) { var (major, minor) = chapter.chapter_number.toString().split(".")
val base64Json = jsonstr.substringAfter("JSON.parse(atob(\"").substringBefore("\"));") if (major == "-1") major = "0" // Some oneshots don't have a chapter
jsonstr = String(Base64.decode(base64Json, Base64.DEFAULT)) return GET("$baseUrl$urlModifier/api/reader/chapter?comic_stub=$slug&chapter=$major&subchapter=$minor")
} }
val json = JsonParser().parse(jsonstr).asJsonArray
val pages = mutableListOf<Page>() override fun pageListParse(document: Document): List<Page> {
val pagesJson = JSONObject(document.body().ownText())
val json = JsonParser().parse(pagesJson.getString("pages")).asJsonArray
val pages = ArrayList<Page>()
json.forEach { json.forEach {
pages.add(Page(pages.size, "", it["url"].asString)) pages.add(Page(pages.size, "", JsonParser().parse(it.toString())["url"].asString))
} }
return pages return pages
} }