From 185a0b4c3732ca54479ea7661624450d3993a3f9 Mon Sep 17 00:00:00 2001 From: Carlos <2092019+CarlosEsco@users.noreply.github.com> Date: Sun, 9 May 2021 19:07:06 -0400 Subject: [PATCH] Mangadex bug fixes and remove piedpiperfb (#6928) * fix ongoing typo fix original language filtering fix filipino language * remove piedpiperfb * add chapter sort order * add volume to the sort also --- .../tachiyomi/multisrc/madara/MadaraGenerator.kt | 1 - src/all/mangadex/build.gradle | 2 +- .../extension/all/mangadex/MDConstants.kt | 1 - .../extension/all/mangadex/MangaDexFactory.kt | 2 +- .../extension/all/mangadex/MangaDexFilters.kt | 15 +++++++++++---- .../extension/all/mangadex/MangaDexHelper.kt | 2 +- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt index e2a22bcd2..c6f582b63 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt @@ -193,7 +193,6 @@ class MadaraGenerator : ThemeSourceGenerator { SingleLang("Origami Orpheans", "https://origami-orpheans.com.br", "pt-BR", overrideVersionCode = 1), SingleLang("Paean Scans", "https://paeanscans.com", "en"), SingleLang("Painful Nightz Scan", "https://painfulnightzscan.com", "en"), - SingleLang("Pied Piper", "https://piedpiperfb.com", "tr"), SingleLang("Platinum Crown", "https://platinumscans.com", "en"), SingleLang("Pojok Manga", "https://pojokmanga.com", "id", overrideVersionCode = 1), SingleLang("PornComix", "https://www.porncomixonline.net", "en", isNsfw = true), diff --git a/src/all/mangadex/build.gradle b/src/all/mangadex/build.gradle index 09d7bbd49..f94b6f741 100644 --- a/src/all/mangadex/build.gradle +++ b/src/all/mangadex/build.gradle @@ -5,7 +5,7 @@ ext { extName = 'MangaDex' pkgNameSuffix = 'all.mangadex' extClass = '.MangaDexFactory' - extVersionCode = 109 + extVersionCode = 110 libVersion = '1.2' containsNsfw = true } diff --git a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MDConstants.kt b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MDConstants.kt index 89e9093c8..8dee31f41 100644 --- a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MDConstants.kt +++ b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MDConstants.kt @@ -36,7 +36,6 @@ object MDConstants { return "${standardHttpsPortPref}_$dexLang" } - private const val contentRatingSafePref = "contentRatingSafe" fun getContentRatingSafePrefKey(dexLang: String): String { diff --git a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexFactory.kt b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexFactory.kt index 616daaf07..448b87a4a 100644 --- a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexFactory.kt +++ b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexFactory.kt @@ -84,7 +84,7 @@ class MangaDexPersian : MangaDex("fa", "fa") class MangaDexMalay : MangaDex("ms", "ms") class MangaDexThai : MangaDex("th", "th") class MangaDexCatalan : MangaDex("ca", "ca") -class MangaDexFilipino : MangaDex("fil", "fi") +class MangaDexFilipino : MangaDex("fil", "tl") class MangaDexChineseTrad : MangaDex("zh-Hant", "zh-hk") class MangaDexUkrainian : MangaDex("uk", "uk") class MangaDexBurmese : MangaDex("my", "my") diff --git a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexFilters.kt b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexFilters.kt index aa188f71b..c19040be2 100644 --- a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexFilters.kt +++ b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexFilters.kt @@ -63,7 +63,7 @@ class MangaDexFilters { Filter.Group("Status", status) private fun getStatus() = listOf( - Status("Onging"), + Status("Ongoing"), Status("Completed"), Status("Hiatus"), Status("Abandoned"), @@ -78,9 +78,9 @@ class MangaDexFilters { Filter.Group("Original language", originalLanguage) private fun getOriginalLanguage() = listOf( - OriginalLanguage("Japanese (Manga)", "jp"), - OriginalLanguage("Chinese (Manhua)", "cn"), - OriginalLanguage("Korean (Manhwa)", "kr"), + OriginalLanguage("Japanese (Manga)", "ja"), + OriginalLanguage("Chinese (Manhua)", "zh"), + OriginalLanguage("Korean (Manhwa)", "ko"), ) internal class Tag(val id: String, name: String) : Filter.TriState(name) @@ -189,6 +189,13 @@ class MangaDexFilters { is OriginalLanguageList -> { filter.state.forEach { lang -> if (lang.state) { + // dex has zh and zh-hk for chinese manhua + if (lang.isoCode == "zh") { + addQueryParameter( + "originalLanguage[]", + "zh-hk" + ) + } addQueryParameter( "originalLanguage[]", lang.isoCode diff --git a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexHelper.kt b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexHelper.kt index 6cf32cb86..ad22369d3 100644 --- a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexHelper.kt +++ b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexHelper.kt @@ -33,7 +33,7 @@ class MangaDexHelper() { * get chapters for manga (aka manga/$id/feed endpoint) */ fun getChapterEndpoint(mangaId: String, offset: Int, langCode: String) = - "${MDConstants.apiMangaUrl}/$mangaId/feed?limit=500&offset=$offset&locales[]=$langCode" + "${MDConstants.apiMangaUrl}/$mangaId/feed?limit=500&offset=$offset&locales[]=$langCode&order[volume]=desc&order[chapter]=desc" /** * Check if the manga url is a valid uuid