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

fix mdlist

Browse Source 
(cherry picked from commit ebf5e492ca8dcc6771349b631ebf7661dfbb7d44)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/online/handlers/FollowsHandler.kt
#	app/src/main/java/exh/md/utils/FollowStatus.kt
This commit is contained in:
Carlos 2021-01-10 10:23:25 -05:00 committed by Jobobby04
parent 33fac3e96b
commit 6bb7b676bd
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/exh/md/handlers/FollowsHandler.kt
View File

@ -11,6 +11,7 @@ import eu.kanade.tachiyomi.source.model.MangasPage
import eu.kanade.tachiyomi.source.model.MetadataMangasPage
import eu.kanade.tachiyomi.source.model.SManga
import exh.md.handlers.serializers.FollowPage
import exh.md.handlers.serializers.FollowsIndividualSerializer
import exh.md.handlers.serializers.FollowsPageSerializer
import exh.md.utils.FollowStatus
import exh.md.utils.MdUtil
@ -50,10 +51,10 @@ class FollowsHandler(val client: OkHttpClient, val headers: Headers, val prefere
)
} catch (e: Exception) {
XLog.tag("FollowsHandler").enableStackTrace(2).e("error parsing follows", e)
FollowsPageSerializer(emptyList())
FollowsPageSerializer(404, emptyList())
}
if (followsPageResult.data.isEmpty()) {
if (followsPageResult.data.isNullOrEmpty() || followsPageResult.code != 200) {
return MetadataMangasPage(emptyList(), false, emptyList())
}
val lowQualityCovers = if (forceHd) false else useLowQualityCovers
@ -75,20 +76,25 @@ class FollowsHandler(val client: OkHttpClient, val headers: Headers, val prefere
private fun followStatusParse(response: Response): Track {
val followsPageResult = try {
MdUtil.jsonParser.decodeFromString(
MdUtil.jsonParser.decodeFromString<FollowsIndividualSerializer>(
response.body?.string().orEmpty()
)
} catch (e: Exception) {
XLog.tag("FollowsHandler").enableStackTrace(2).e("error parsing follows", e)
FollowsPageSerializer(emptyList())
throw e
}
if (followsPageResult.data == null) {
throw Exception("Invalid response ${followsPageResult.code}")
}
val track = Track.create(TrackManager.MDLIST)
if (followsPageResult.data.isEmpty()) {
if (followsPageResult.code == 404) {
track.status = FollowStatus.UNFOLLOWED.int
} else {
val follow = followsPageResult.data.first()
val follow = followsPageResult.data
track.status = follow.followType
if (followsPageResult.data[0].chapter.isNotBlank()) {
if (follow.chapter.isNotBlank()) {
track.last_chapter_read = follow.chapter.toFloat().floor()
}
track.tracking_url = MdUtil.baseUrl + follow.mangaId.toString()
@ -170,7 +176,7 @@ class FollowsHandler(val client: OkHttpClient, val headers: Headers, val prefere
"${MdUtil.baseUrl}/ajax/actions.ajax.php?function=manga_rating&id=$mangaID&rating=${track.score.toInt()}",
headers
)
).await()
).await().body?.close()
withContext(Dispatchers.IO) { response.body?.string().isNullOrEmpty() }
}

9
app/src/main/java/exh/md/handlers/serializers/FollowsPageSerializer.kt
View File

@ -4,7 +4,14 @@ import kotlinx.serialization.Serializable
@Serializable
data class FollowsPageSerializer(
val data: List<FollowPage>
val code: Int,
val data: List<FollowPage>?
)
@Serializable
data class FollowsIndividualSerializer(
val code: Int,
val data: FollowPage?
)
@Serializable

2
app/src/main/java/exh/md/utils/FollowStatus.kt
View File

@ -10,6 +10,6 @@ enum class FollowStatus(val int: Int) {
RE_READING(6);
companion object {
fun fromInt(value: Int): FollowStatus? = values().find { it.int == value }
fun fromInt(value: Int): FollowStatus = FollowStatus.values().find { it.int == value } ?: UNFOLLOWED
}
}