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

switch off kotson for chapter deeplink

Browse Source 
(cherry picked from commit 6b545e84aba0d5657a09a8c00735f9f9d4ee28bb)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/online/handlers/ApiMangaParser.kt
#	app/src/main/java/exh/md/handlers/serializers/ApiChapterSerializer.kt
This commit is contained in:
Carlos 2021-01-15 09:38:25 -05:00 committed by Jobobby04
parent 5fefefcb23
commit e713340ced
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/exh/md/handlers/ApiMangaParser.kt
View File

@ -6,6 +6,7 @@ import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.network.parseAs import eu.kanade.tachiyomi.network.parseAs
import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.source.model.SManga
import eu.kanade.tachiyomi.util.asJsoup import eu.kanade.tachiyomi.util.asJsoup
import exh.md.handlers.serializers.ApiChapterSerializer
import exh.md.handlers.serializers.ApiMangaSerializer import exh.md.handlers.serializers.ApiMangaSerializer
import exh.md.handlers.serializers.ChapterSerializer import exh.md.handlers.serializers.ChapterSerializer
import exh.md.utils.MdLang import exh.md.utils.MdLang
@ -254,13 +255,10 @@ class ApiMangaParser(private val lang: String) {
fun chapterParseForMangaId(response: Response): Int { fun chapterParseForMangaId(response: Response): Int {
try { try {
if (response.code != 200) throw Exception("HTTP error ${response.code}") if (response.code != 200) throw Exception("HTTP error ${response.code}")
val body = response.body?.string() checkNotNull(response.body) {
if (body.isNullOrBlank()) { "Null Response"
throw Exception("Null Response")
} }
return response.parseAs<ApiChapterSerializer>().data.mangaId
val jsonObject = Json.decodeFromString<JsonObject>(body)
return jsonObject["data"]!!.jsonObject["mangaId"]?.jsonPrimitive?.intOrNull ?: throw Exception("No manga associated with chapter")
} catch (e: Exception) { } catch (e: Exception) {
XLog.tag("ApiMangaParser").enableStackTrace(2).e(e) XLog.tag("ApiMangaParser").enableStackTrace(2).e(e)
throw e throw e

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

@ -19,5 +19,6 @@ data class ApiChapterSerializer(
data class ChapterPageSerializer( data class ChapterPageSerializer(
val hash: String, val hash: String,
val pages: List<String>, val pages: List<String>,
val server: String val server: String,
) val mangaId: Int
)