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

DigitalTeam: fix external images (#10310)

This commit is contained in:
Vetle Ledaal 2022-01-02 23:48:16 +00:00 committed by GitHub
parent 542c28875d
commit 98f69886ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/it/digitalteam/build.gradle
View File

@ -6,7 +6,7 @@ ext {
extName = 'DigitalTeam' extName = 'DigitalTeam'
pkgNameSuffix = 'it.digitalteam' pkgNameSuffix = 'it.digitalteam'
extClass = '.DigitalTeam' extClass = '.DigitalTeam'
extVersionCode = 2 extVersionCode = 3
} }
apply from: "$rootDir/common.gradle" apply from: "$rootDir/common.gradle"

41
src/it/digitalteam/src/eu/kanade/tachiyomi/extension/it/digitalteam/DigitalTeam.kt
View File

@ -107,17 +107,22 @@ class DigitalTeam : ParsedHttpSource() {
} ?: 0 } ?: 0
} }
private fun getXhrPages(script_content: String, title: String): String { private fun getXhrPages(script_content: String, title: String, external: Boolean): String {
val infoManga = script_content.substringAfter("m='").substringBefore("'") val infoManga = script_content.substringAfter("m='").substringBefore("'")
val infoChapter = script_content.substringAfter("ch='").substringBefore("'") val infoChapter = script_content.substringAfter("ch='").substringBefore("'")
val infoChSub = script_content.substringAfter("chs='").substringBefore("'") val infoChSub = script_content.substringAfter("chs='").substringBefore("'")
val formBody = FormBody.Builder() val formBodyBuilder = FormBody.Builder()
.add("info[manga]", infoManga) .add("info[manga]", infoManga)
.add("info[chapter]", infoChapter) .add("info[chapter]", infoChapter)
.add("info[ch_sub]", infoChSub) .add("info[ch_sub]", infoChSub)
.add("info[title]", title) .add("info[title]", title)
.build()
if (external) {
formBodyBuilder.add("info[external]", "1")
}
val formBody = formBodyBuilder.build()
val xhrHeaders = headersBuilder() val xhrHeaders = headersBuilder()
.add("Content-Length", formBody.contentLength().toString()) .add("Content-Length", formBody.contentLength().toString())
@ -139,18 +144,32 @@ class DigitalTeam : ParsedHttpSource() {
.substringAfter("current_page=") .substringAfter("current_page=")
.substringBefore(";") .substringBefore(";")
val title = document.select("title").first().text() val title = document.select("title").first().text()
val external = document.select("script[src*='jq_rext.js']").isNotEmpty()
val xhrPages = getXhrPages(scriptContent, title) val xhrPages = getXhrPages(scriptContent, title, external)
val jsonResult = json.parseToJsonElement(xhrPages).jsonArray val jsonResult = json.parseToJsonElement(xhrPages).jsonArray
val imageData = jsonResult[0].jsonArray val imageDatas = jsonResult[0].jsonArray
val imagePath = jsonResult[2].jsonPrimitive.content if (external) {
val imageBases = jsonResult[1].jsonArray
return jsonResult[1].jsonArray.mapIndexed { i, jsonEl -> return imageDatas.zip(imageBases).mapIndexed { i, (imageData, imageBase) ->
val imageUrl = "$baseUrl/reader$imagePath" + val imageUrl = imageBase.jsonPrimitive.content +
imageData[i].jsonObject["name"]!!.jsonPrimitive.content + imageData.jsonObject["name"]!!.jsonPrimitive.content +
jsonEl.jsonPrimitive.content + imageData.jsonObject["ex"]!!.jsonPrimitive.content
imageData[i].jsonObject["ex"]!!.jsonPrimitive.content
Page(i, "", imageUrl)
}
}
val imageSuffixes = jsonResult[1].jsonArray
val imageBase = jsonResult[2].jsonPrimitive.content
return imageDatas.zip(imageSuffixes).mapIndexed { i, (imageData, imageSuffix) ->
val imageUrl = "$baseUrl/reader$imageBase" +
imageData.jsonObject["name"]!!.jsonPrimitive.content +
imageSuffix.jsonPrimitive.content +
imageData.jsonObject["ex"]!!.jsonPrimitive.content
Page(i, "", imageUrl) Page(i, "", imageUrl)
} }