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

Fix MangaPlus chapters for MangaDex

Browse Source
This commit is contained in:
Jobobby04 2021-01-21 14:47:03 -05:00
parent a17c4c151f
commit 34f8407983
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt
View File

@ -151,8 +151,8 @@ class MangaDex(delegate: HttpSource, val context: Context) :
} }
private fun mangaPlusPageListRequest(chapter: SChapter): Request { private fun mangaPlusPageListRequest(chapter: SChapter): Request {
val chpUrl = chapter.url.substringBefore(MdUtil.apiChapterSuffix) val urlChapterId = MdUtil.getChapterId(chapter.url)
return GET(MdUtil.baseUrl + chpUrl + MdUtil.apiChapterSuffix, headers, CacheControl.FORCE_NETWORK) return GET(MdUtil.apiUrl + MdUtil.newApiChapter + urlChapterId + MdUtil.apiChapterSuffix, headers, CacheControl.FORCE_NETWORK)
} }
override fun fetchImage(page: Page): Observable<Response> { override fun fetchImage(page: Page): Observable<Response> {

5
app/src/main/java/exh/md/handlers/ApiChapterParser.kt
View File

@ -4,8 +4,6 @@ import eu.kanade.tachiyomi.network.parseAs
import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.Page
import exh.md.handlers.serializers.ApiChapterSerializer import exh.md.handlers.serializers.ApiChapterSerializer
import exh.md.utils.MdUtil import exh.md.utils.MdUtil
import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.json.jsonObject import kotlinx.serialization.json.jsonObject
import kotlinx.serialization.json.jsonPrimitive import kotlinx.serialization.json.jsonPrimitive
@ -27,8 +25,7 @@ class ApiChapterParser {
} }
fun externalParse(response: Response): String { fun externalParse(response: Response): String {
val jsonData = response.body!!.string() val json = response.parseAs<JsonObject>()
val json = Json.decodeFromString<JsonObject>(jsonData)
val external = json["data"]!!.jsonObject["pages"]!!.jsonPrimitive.content val external = json["data"]!!.jsonObject["pages"]!!.jsonPrimitive.content
return external.substringAfterLast("/") return external.substringAfterLast("/")
} }