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

fix status not showing completed, when cancelled status on mangadex. (#426) 

fix status not showing completed, when last chapter was not selected language
This commit is contained in:
Carlos 2018-08-02 21:37:45 -04:00 committed by GitHub
parent db10d901f8
commit c63ef3dda2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/Mangadex.kt
View File

@ -225,6 +225,7 @@ open class Mangadex(override val lang: String, private val internalLang: String,
var jsonData = response.body()!!.string() var jsonData = response.body()!!.string()
val json = JsonParser().parse(jsonData).asJsonObject val json = JsonParser().parse(jsonData).asJsonObject
val mangaJson = json.getAsJsonObject("manga") val mangaJson = json.getAsJsonObject("manga")
val chapterJson = json.getAsJsonObject("chapter")
manga.title = baseUrl + mangaJson.get("title").string manga.title = baseUrl + mangaJson.get("title").string
manga.thumbnail_url = baseUrl + mangaJson.get("cover_url").string manga.thumbnail_url = baseUrl + mangaJson.get("cover_url").string
manga.description = cleanString(mangaJson.get("description").string) manga.description = cleanString(mangaJson.get("description").string)
@ -232,7 +233,7 @@ open class Mangadex(override val lang: String, private val internalLang: String,
manga.artist = mangaJson.get("artist").string manga.artist = mangaJson.get("artist").string
val status = mangaJson.get("status").int val status = mangaJson.get("status").int
val finalChapterNumber = getFinalChapter(mangaJson) val finalChapterNumber = getFinalChapter(mangaJson)
if (status == 2 && json.getAsJsonObject("chapter") != null && isMangaCompleted(finalChapterNumber, json.getAsJsonObject("chapter"))) { if ((status == 2 || status == 3) && chapterJson != null && isMangaCompleted(finalChapterNumber, chapterJson)) {
manga.status = SManga.COMPLETED manga.status = SManga.COMPLETED
} else { } else {
manga.status = parseStatus(status) manga.status = parseStatus(status)
@ -271,17 +272,13 @@ open class Mangadex(override val lang: String, private val internalLang: String,
private fun getFinalChapter(jsonObj: JsonObject) = jsonObj.get("last_chapter").string.trim() private fun getFinalChapter(jsonObj: JsonObject) = jsonObj.get("last_chapter").string.trim()
private fun isMangaCompleted(finalChapterNumber: String, chapterJson: JsonObject): Boolean { private fun isMangaCompleted(finalChapterNumber: String, chapterJson: JsonObject): Boolean {
val count = chapterJson.entrySet()
val count = chapterJson?.toMap().values.filter { it -> .filter { it -> it.value.asJsonObject.get("lang_code").string == internalLang }
val chapterElement = it.asJsonObject .filter { it -> doesFinalChapterExist(finalChapterNumber, it.value) }?.count()
return chapterElement.get("lang_code").string == internalLang && doesFinalChapterExist(finalChapterNumber, it)
}?.count()
return when (count) { return when (count) {
0 -> false 0 -> false
else -> true else -> true
} }
} }
private fun doesFinalChapterExist(finalChapterNumber: String, chapterJson: JsonElement) = finalChapterNumber.isNotEmpty() && finalChapterNumber == chapterJson.get("chapter").string.trim() private fun doesFinalChapterExist(finalChapterNumber: String, chapterJson: JsonElement) = finalChapterNumber.isNotEmpty() && finalChapterNumber == chapterJson.get("chapter").string.trim()
@ -326,7 +323,7 @@ open class Mangadex(override val lang: String, private val internalLang: String,
} }
chapterName.add(chapterJson.get("title").string) chapterName.add(chapterJson.get("title").string)
} }
if (status == 2 && doesFinalChapterExist(finalChapterNumber, chapterJson)) { if ((status == 2 || status == 3) && doesFinalChapterExist(finalChapterNumber, chapterJson)) {
chapterName.add("[END]") chapterName.add("[END]")
} }