From b1f787e5b2c2ff8ca887cad03c77c57580aa90f0 Mon Sep 17 00:00:00 2001 From: ObserverOfTime Date: Sun, 23 Feb 2020 04:20:16 +0200 Subject: [PATCH] MangAdventure: support custom chapter titles (#2282) --- src/all/mangadventure/build.gradle | 2 +- .../extension/all/mangadventure/MangAdventure.kt | 4 +++- .../all/mangadventure/MangAdventureExtensions.kt | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/all/mangadventure/build.gradle b/src/all/mangadventure/build.gradle index f217a3f16..76f8ce443 100644 --- a/src/all/mangadventure/build.gradle +++ b/src/all/mangadventure/build.gradle @@ -5,7 +5,7 @@ ext { appName = 'Tachiyomi: MangAdventure' pkgNameSuffix = 'all.mangadventure' extClass = '.MangAdventureFactory' - extVersionCode = 5 + extVersionCode = 6 libVersion = '1.2' } diff --git a/src/all/mangadventure/src/eu/kanade/tachiyomi/extension/all/mangadventure/MangAdventure.kt b/src/all/mangadventure/src/eu/kanade/tachiyomi/extension/all/mangadventure/MangAdventure.kt index abf300d71..8ff372c28 100644 --- a/src/all/mangadventure/src/eu/kanade/tachiyomi/extension/all/mangadventure/MangAdventure.kt +++ b/src/all/mangadventure/src/eu/kanade/tachiyomi/extension/all/mangadventure/MangAdventure.kt @@ -122,7 +122,7 @@ abstract class MangAdventure( } ) } - }.sortedByDescending(SChapter::name).toList() + }.toList().reversed() } override fun mangaDetailsParse(response: Response) = @@ -131,7 +131,9 @@ abstract class MangAdventure( override fun pageListParse(response: Response) = JSONObject(response.asString()).run { val url = getString("url") + // Workaround for a bug in MangAdventure < 0.6.3 val root = getString("pages_root") + .replace("://media/series", "://reader") val arr = getJSONArray("pages_list") (0 until arr.length()).map { Page(it, "$url${it + 1}", "$root${arr.getString(it)}") diff --git a/src/all/mangadventure/src/eu/kanade/tachiyomi/extension/all/mangadventure/MangAdventureExtensions.kt b/src/all/mangadventure/src/eu/kanade/tachiyomi/extension/all/mangadventure/MangAdventureExtensions.kt index cf917c968..83b2af5fd 100644 --- a/src/all/mangadventure/src/eu/kanade/tachiyomi/extension/all/mangadventure/MangAdventureExtensions.kt +++ b/src/all/mangadventure/src/eu/kanade/tachiyomi/extension/all/mangadventure/MangAdventureExtensions.kt @@ -72,10 +72,10 @@ fun SChapter.fromJSON(obj: JSONObject) = apply { chapter_number = obj.optString("chapter", "0").toFloat() date_upload = MangAdventure.httpDateToTimestamp(obj.getString("date")) scanlator = obj.getJSONArray("groups")?.joinField("name", " & ") - name = buildString { - obj.optInt("volume").let { if (it != 0) append("Vol.$it ") } - append("Ch.${DecimalFormat("#.#").format(chapter_number)} - ") + name = obj.optString("full_title", buildString { + obj.optInt("volume").let { if (it != 0) append("Vol. $it, ") } + append("Ch. ${DecimalFormat("#.#").format(chapter_number)}: ") append(obj.getString("title")) - if (obj.getBoolean("final")) append(" [END]") - } + }) + if (obj.getBoolean("final")) name += " [END]" }