From 0dc21c1b38113a647beb143a4e53818425d4c5bf Mon Sep 17 00:00:00 2001 From: Mike <51273546+SnakeDoc83@users.noreply.github.com> Date: Thu, 11 Jun 2020 17:40:22 -0400 Subject: [PATCH] MangaDex - MangaPlus message (#3489) * MangaDex - MangaPlus message * Update MangaDex.kt --- src/all/mangadex/build.gradle | 2 +- .../tachiyomi/extension/all/mangadex/MangaDex.kt | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/all/mangadex/build.gradle b/src/all/mangadex/build.gradle index adbb481bd..ee33dff5f 100644 --- a/src/all/mangadex/build.gradle +++ b/src/all/mangadex/build.gradle @@ -5,7 +5,7 @@ ext { appName = 'Tachiyomi: MangaDex' pkgNameSuffix = 'all.mangadex' extClass = '.MangaDexFactory' - extVersionCode = 92 + extVersionCode = 93 libVersion = '1.2' } diff --git a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDex.kt b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDex.kt index b2c15ef4f..b1abd19cd 100644 --- a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDex.kt +++ b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDex.kt @@ -464,6 +464,7 @@ abstract class MangaDex( private fun doesFinalChapterExist(finalChapterNumber: String, chapterJson: JsonElement) = finalChapterNumber.isNotEmpty() && finalChapterNumber == chapterJson["chapter"].string.trim() override fun chapterListParse(response: Response): List { + hasMangaPlus = false val now = Date().time val jsonData = response.body()!!.string() val json = JsonParser().parse(jsonData).asJsonObject @@ -481,7 +482,7 @@ abstract class MangaDex( chapters.add(chapterFromJson(key, chapterElement, finalChapterNumber, status)) } } - return chapters + return chapters.also { if (it.isEmpty() && hasMangaPlus) throw Exception("This only has MangaPlus chapters, use the MangaPlus extension") } } /** @@ -494,7 +495,10 @@ abstract class MangaDex( return when { chapterJson.get("lang_code").string != internalLang -> false (chapterJson.get("timestamp").asLong * 1000) > now -> false - chapterJson.get("group_id").string == "9097" -> false + chapterJson.get("group_id").string == "9097" -> { + hasMangaPlus = true + false + } else -> true } } @@ -938,5 +942,7 @@ abstract class MangaDex( Pair("Spanish (LATAM)", "29"), Pair("Thai", "32"), Pair("Filipino", "34")) + + private var hasMangaPlus = false } }