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

mangadex: fix completed and [END] being added mistakenly on manga with only 1 chapter labelled chapter number 0 (#381)

This commit is contained in:
Carlos 2018-07-05 09:38:43 -04:00 committed by GitHub
parent 43b841363f
commit 17d643f25a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/all/mangadex/build.gradle
View File

@ -5,8 +5,8 @@ ext {
appName = 'Tachiyomi: MangaDex' appName = 'Tachiyomi: MangaDex'
pkgNameSuffix = "all.mangadex" pkgNameSuffix = "all.mangadex"
extClass = '.MangadexFactory' extClass = '.MangadexFactory'
extVersionCode = 30 extVersionCode = 31
extVersionSuffix = 30 extVersionSuffix = 31
libVersion = '1.2' libVersion = '1.2'
} }

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

@ -230,11 +230,12 @@ open class Mangadex(override val lang: String, private val internalLang: String,
manga.description = cleanString(mangaJson.get("description").string) manga.description = cleanString(mangaJson.get("description").string)
manga.author = mangaJson.get("author").string manga.author = mangaJson.get("author").string
manga.artist = mangaJson.get("artist").string manga.artist = mangaJson.get("artist").string
val status = mangaJson.get("status").int
val finalChapterNumber = getFinalChapter(mangaJson) val finalChapterNumber = getFinalChapter(mangaJson)
if (json.getAsJsonObject("chapter") != null && isMangaCompleted(finalChapterNumber, json.getAsJsonObject("chapter"))) { if (status == 2 && json.getAsJsonObject("chapter") != null && isMangaCompleted(finalChapterNumber, json.getAsJsonObject("chapter"))) {
manga.status = SManga.COMPLETED manga.status = SManga.COMPLETED
} else { } else {
manga.status = parseStatus(mangaJson.get("status").int) manga.status = parseStatus(status)
} }
var genres = mutableListOf<String>() var genres = mutableListOf<String>()
@ -290,6 +291,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 status = mangaJson.get("status").int
var finalChapterNumber = getFinalChapter(mangaJson) var finalChapterNumber = getFinalChapter(mangaJson)
@ -301,13 +303,13 @@ open class Mangadex(override val lang: String, private val internalLang: String,
val chapterElement = jsonElement.asJsonObject val chapterElement = jsonElement.asJsonObject
if (chapterElement.get("lang_code").string == internalLang && (chapterElement.get("timestamp").asLong * 1000) <= now) { if (chapterElement.get("lang_code").string == internalLang && (chapterElement.get("timestamp").asLong * 1000) <= now) {
chapterElement.toString() chapterElement.toString()
chapters.add(chapterFromJson(key, chapterElement, finalChapterNumber)) chapters.add(chapterFromJson(key, chapterElement, finalChapterNumber, status))
} }
} }
return chapters return chapters
} }
private fun chapterFromJson(chapterId: String, chapterJson: JsonObject, finalChapterNumber: String): SChapter { private fun chapterFromJson(chapterId: String, chapterJson: JsonObject, finalChapterNumber: String, status: Int): SChapter {
val chapter = SChapter.create() val chapter = SChapter.create()
chapter.url = BASE_CHAPTER + chapterId chapter.url = BASE_CHAPTER + chapterId
var chapterName = mutableListOf<String>() var chapterName = mutableListOf<String>()
@ -324,7 +326,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 (doesFinalChapterExist(finalChapterNumber, chapterJson)) { if (status == 2 && doesFinalChapterExist(finalChapterNumber, chapterJson)) {
chapterName.add("[END]") chapterName.add("[END]")
} }