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

Automatically check which endpoint to use in Madara. (#9948)

This commit is contained in:
Alessandro Jean 2021-11-28 13:15:50 -03:00 committed by GitHub
parent 37c4df824a
commit 67b94602e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/Madara.kt
View File

@ -422,6 +422,14 @@ abstract class Madara(
*/ */
protected open val useNewChapterEndpoint: Boolean = false protected open val useNewChapterEndpoint: Boolean = false
/**
* Internal attribute to control if it should always use the
* new chapter endpoint after a first check if useNewChapterEndpoint is
* set to false. Using a separate variable to still allow the other
* one to be overridable manually in each source.
*/
private var oldChapterEndpointDisabled: Boolean = false
protected open fun oldXhrChaptersRequest(mangaId: String): Request { protected open fun oldXhrChaptersRequest(mangaId: String): Request {
val form = FormBody.Builder() val form = FormBody.Builder()
.add("action", "manga_get_chapters") .add("action", "manga_get_chapters")
@ -457,8 +465,19 @@ abstract class Madara(
val mangaUrl = document.location().removeSuffix("/") val mangaUrl = document.location().removeSuffix("/")
val mangaId = chaptersWrapper.attr("data-id") val mangaId = chaptersWrapper.attr("data-id")
val xhrRequest = if (useNewChapterEndpoint) xhrChaptersRequest(mangaUrl) else oldXhrChaptersRequest(mangaId) var xhrRequest = if (useNewChapterEndpoint || oldChapterEndpointDisabled)
val xhrResponse = client.newCall(xhrRequest).execute() xhrChaptersRequest(mangaUrl) else oldXhrChaptersRequest(mangaId)
var xhrResponse = client.newCall(xhrRequest).execute()
// Newer Madara versions throws HTTP 400 when using the old endpoint.
if (!useNewChapterEndpoint && xhrResponse.code == 400) {
xhrResponse.close()
// Set it to true so following calls will be made directly to the new endpoint.
oldChapterEndpointDisabled = true
xhrRequest = xhrChaptersRequest(mangaUrl)
xhrResponse = client.newCall(xhrRequest).execute()
}
chapterElements = xhrResponse.asJsoup().select(chapterListSelector()) chapterElements = xhrResponse.asJsoup().select(chapterListSelector())
xhrResponse.close() xhrResponse.close()

2
multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt
View File

@ -10,7 +10,7 @@ class MadaraGenerator : ThemeSourceGenerator {
override val themeClass = "Madara" override val themeClass = "Madara"
override val baseVersionCode: Int = 12 override val baseVersionCode: Int = 13
override val sources = listOf( override val sources = listOf(
MultiLang("Leviatan Scans", "https://leviatanscans.com", listOf("en", "es"), className = "LeviatanScansFactory", overrideVersionCode = 9), MultiLang("Leviatan Scans", "https://leviatanscans.com", listOf("en", "es"), className = "LeviatanScansFactory", overrideVersionCode = 9),