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

fix exception when chapter number is not a valid number; remove initial hyphen in chapter name (#365)

Browse Source
This commit is contained in:
paronos 2018-06-19 22:08:41 +02:00 committed by Carlos
parent 985c9740f9
commit 2c39f21d70
2 changed files with 10 additions and 16 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 = 27 extVersionCode = 28
extVersionSuffix = 27 extVersionSuffix = 28
libVersion = '1.2' libVersion = '1.2'
} }

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

@ -270,16 +270,9 @@ open class Mangadex(override val lang: String, private val internalLang: String,
} }
} }
private fun getFinalChapter(jsonObj: JsonObject): Double { private fun getFinalChapter(jsonObj: JsonObject) = jsonObj.get("last_chapter").string.trim()
var finalChapterNumber = 0.00
if (jsonObj.get("last_chapter").string.isNotBlank()) { private fun isMangaCompleted(finalChapterNumber: String, chapterJson: JsonObject): Boolean {
finalChapterNumber = jsonObj.get("last_chapter").double
}
return finalChapterNumber
}
private fun isMangaCompleted(finalChapterNumber: Double, chapterJson: JsonObject): Boolean {
val count = chapterJson.toMap().values.filter { it -> val count = chapterJson.toMap().values.filter { it ->
val chapterElement = it.asJsonObject val chapterElement = it.asJsonObject
@ -293,8 +286,7 @@ open class Mangadex(override val lang: String, private val internalLang: String,
} }
private fun doesFinalChapterExist(finalChapterNumber: Double, chapterJson: JsonElement) = finalChapterNumber != 0.00 && chapterJson.get("chapter").string.isNotEmpty() && chapterJson.get("chapter").double == finalChapterNumber private fun doesFinalChapterExist(finalChapterNumber: String, chapterJson: JsonElement) = finalChapterNumber.isNotEmpty() && finalChapterNumber == chapterJson.get("chapter").string.trim()
override fun chapterListParse(response: Response): List<SChapter> { override fun chapterListParse(response: Response): List<SChapter> {
val now = Date().time val now = Date().time
@ -318,7 +310,7 @@ open class Mangadex(override val lang: String, private val internalLang: String,
return chapters return chapters
} }
private fun chapterFromJson(chapterId: String, chapterJson: JsonObject, finalChapterNumber: Double): SChapter { private fun chapterFromJson(chapterId: String, chapterJson: JsonObject, finalChapterNumber: String): 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>()
@ -330,7 +322,9 @@ open class Mangadex(override val lang: String, private val internalLang: String,
chapterName.add("Ch." + chapterJson.get("chapter").string) chapterName.add("Ch." + chapterJson.get("chapter").string)
} }
if (chapterJson.get("title").string.isNotBlank()) { if (chapterJson.get("title").string.isNotBlank()) {
if (!chapterName.isEmpty()) {
chapterName.add("-") chapterName.add("-")
}
chapterName.add(chapterJson.get("title").string) chapterName.add(chapterJson.get("title").string)
} }
if (doesFinalChapterExist(finalChapterNumber, chapterJson)) { if (doesFinalChapterExist(finalChapterNumber, chapterJson)) {