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

MadTheme: Fix chapter client (#7361)

Browse Source 
fix and try to limit api calls
This commit is contained in:
dngonz 2025-01-28 12:38:17 +01:00 committed by Draff
parent 448956e853
commit 5fd5b76527
No known key found for this signature in database
GPG Key ID: E8A89F3211677653
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib-multisrc/madtheme/build.gradle.kts
View File

@ -2,4 +2,4 @@ plugins {
id("lib-multisrc") id("lib-multisrc")
} }
baseVersionCode = 16 baseVersionCode = 17

31
lib-multisrc/madtheme/src/eu/kanade/tachiyomi/multisrc/madtheme/MadTheme.kt
View File

@ -11,7 +11,6 @@ import eu.kanade.tachiyomi.source.model.SChapter
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.source.online.ParsedHttpSource import eu.kanade.tachiyomi.source.online.ParsedHttpSource
import eu.kanade.tachiyomi.util.asJsoup import eu.kanade.tachiyomi.util.asJsoup
import kotlinx.serialization.json.Json
import okhttp3.Headers import okhttp3.Headers
import okhttp3.HttpUrl import okhttp3.HttpUrl
import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.HttpUrl.Companion.toHttpUrl
@ -23,7 +22,6 @@ import org.jsoup.Jsoup
import org.jsoup.nodes.Document import org.jsoup.nodes.Document
import org.jsoup.nodes.Element import org.jsoup.nodes.Element
import rx.Observable import rx.Observable
import uy.kohesive.injekt.injectLazy
import java.text.ParseException import java.text.ParseException
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Calendar import java.util.Calendar
@ -53,8 +51,6 @@ abstract class MadTheme(
add("Referer", "$baseUrl/") add("Referer", "$baseUrl/")
} }
private val json: Json by injectLazy()
private var genreKey = "genre[]" private var genreKey = "genre[]"
// Popular // Popular
@ -179,21 +175,30 @@ abstract class MadTheme(
return super.chapterListParse(response) return super.chapterListParse(response)
} }
val script = response.asJsoup().selectFirst("script:containsData(bookId)") val document = response.asJsoup()
// Need the total chapters to check against the request
val totalChapters = document.selectFirst(".title span:containsOwn(CHAPTERS \\()")?.text()
?.substringAfter("(")
?.substringBefore(")")
?.toIntOrNull()
val script = document.selectFirst("script:containsData(bookId)")
?: throw Exception("Cannot find script") ?: throw Exception("Cannot find script")
val bookId = script.data().substringAfter("bookId = ").substringBefore(";") val bookId = script.data().substringAfter("bookId = ").substringBefore(";")
val bookSlug = script.data().substringAfter("bookSlug = \"").substringBefore("\";") val bookSlug = script.data().substringAfter("bookSlug = \"").substringBefore("\";")
// At this moment we can not decide which endpoint has the chapters, so we call both. // Use slug search by default
val idRequest = client.newCall(GET(buildChapterUrl(bookId), headers)).execute() val slugRequest = chapterClient.newCall(GET(buildChapterUrl(bookSlug), headers)).execute()
val slugRequest = client.newCall(GET(buildChapterUrl(bookSlug), headers)).execute() if (!slugRequest.isSuccessful) {
throw Exception("HTTP error ${slugRequest.code}")
}
// By default the id request will be the final, due to some extension don't even has slug fetch. var finalDocument = slugRequest.asJsoup().select(chapterListSelector())
var finalDocument = idRequest.asJsoup().select(chapterListSelector())
val slugDocument = slugRequest.asJsoup().select(chapterListSelector())
if (finalDocument.size < slugDocument.size) { if (totalChapters != null && finalDocument.size < totalChapters) {
finalDocument = slugDocument val idRequest = chapterClient.newCall(GET(buildChapterUrl(bookId), headers)).execute()
finalDocument = idRequest.asJsoup().select(chapterListSelector())
} }
return finalDocument.map { return finalDocument.map {