From 35936e3c9a6d0f2e614e42e5c23edd096100396e Mon Sep 17 00:00:00 2001 From: Carlos <2092019+CarlosEsco@users.noreply.github.com> Date: Fri, 8 Jan 2021 16:22:33 -0500 Subject: [PATCH] finish transition to api v2 (cherry picked from commit 4039f6927e627279cf1b324279a2d817a007d29b) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/source/online/handlers/ApiMangaParser.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterSheet.kt # app/src/main/java/exh/md/handlers/MangaHandler.kt # app/src/main/java/exh/md/utils/MdUtil.kt # app/src/main/res/layout/reader_activity.xml # app/src/main/res/layout/reader_chapters_sheet.xml # app/src/main/res/menu/reader.xml --- .../tachiyomi/source/online/all/MangaDex.kt | 2 +- .../java/exh/md/handlers/ApiMangaParser.kt | 2 +- .../main/java/exh/md/handlers/MangaHandler.kt | 2 +- app/src/main/java/exh/md/utils/MdUtil.kt | 105 +++++++++--------- 4 files changed, 56 insertions(+), 55 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt index 287319bc1..924eb9918 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt @@ -114,7 +114,7 @@ class MangaDex(delegate: HttpSource, val context: Context) : override fun mapUrlToChapterUrl(uri: Uri): String? { if (!uri.pathSegments.firstOrNull().equals("chapter", true)) return null val id = uri.pathSegments.getOrNull(1) ?: return null - return MdUtil.apiChapterOld + id + return MdUtil.oldApiChapter + id } override suspend fun mapChapterUrlToMangaUrl(uri: Uri): String? { diff --git a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt index 3d1b466a0..e430efef5 100644 --- a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt +++ b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt @@ -275,7 +275,7 @@ class ApiMangaParser(private val langs: List) { groups: Map ): SChapter { val chapter = SChapter.create() - chapter.url = MdUtil.apiChapterOld + networkChapter.id + chapter.url = MdUtil.oldApiChapter + networkChapter.id val chapterName = mutableListOf() // Build chapter name diff --git a/app/src/main/java/exh/md/handlers/MangaHandler.kt b/app/src/main/java/exh/md/handlers/MangaHandler.kt index 3bd1ea91b..df756f9a3 100644 --- a/app/src/main/java/exh/md/handlers/MangaHandler.kt +++ b/app/src/main/java/exh/md/handlers/MangaHandler.kt @@ -56,7 +56,7 @@ class MangaHandler(val client: OkHttpClient, val headers: Headers, val langs: Li suspend fun getMangaIdFromChapterId(urlChapterId: String): Int { return withContext(Dispatchers.IO) { - val request = GET(MdUtil.apiUrl + MdUtil.apiChapter + urlChapterId + MdUtil.apiChapterSuffix, headers, CacheControl.FORCE_NETWORK) + val request = GET(MdUtil.apiUrl + MdUtil.newApiChapter + urlChapterId + MdUtil.apiChapterSuffix, headers, CacheControl.FORCE_NETWORK) val response = client.newCall(request).await() ApiMangaParser(langs).chapterParseForMangaId(response) } diff --git a/app/src/main/java/exh/md/utils/MdUtil.kt b/app/src/main/java/exh/md/utils/MdUtil.kt index 2db968111..ae50db30c 100644 --- a/app/src/main/java/exh/md/utils/MdUtil.kt +++ b/app/src/main/java/exh/md/utils/MdUtil.kt @@ -26,8 +26,8 @@ class MdUtil { const val apiUrl = "https://api.mangadex.org" const val apiManga = "/v2/manga/" const val includeChapters = "?include=chapters" - const val apiChapter = "/v2/chapter/" - const val apiChapterOld = "/api/chapter/" + const val oldApiChapter = "/api/chapter/" + const val newApiChapter = "/v2/chapter/" const val apiChapterSuffix = "?mark_read=0" const val groupSearchUrl = "$baseUrl/groups/0/1/" const val followsAllApi = "/v2/user/me/followed-manga" @@ -56,65 +56,66 @@ class MdUtil { ) val descriptionLanguages = listOf( - "Russian / Русский", - "[u]Russian", - "[b][u]Russian", - "[RUS]", - "Russian / Русский", - "Russian/Русский:", - "Russia/Русское", - "Русский", - "RUS:", - "[b][u]German / Deutsch", - "German/Deutsch:", - "Español / Spanish", - "Spanish / Español", - "Spanish / Espa & ntilde; ol", - "Spanish / Español", - "[b][u]Spanish", - "[Español]:", + "=FRANCAIS=", "[b] Spanish: [/ b]", - "정보", - "Spanish/Español", - "Español / Spanish", - "Italian / Italiano", - "Italian/Italiano", + "[b][u]Chinese", + "[b][u]French", + "[b][u]German / Deutsch", + "[b][u]Russian", + "[b][u]Spanish", + "[b][u]Vietnamese", + "[b]External Links", + "[b]Link[/b]", + "[b]Links:", + "[Español]:", + "[hr]Fr:", + "[hr]TH", + "[INDO]", + "[PTBR]", + "[right][b][u]Persian", + "[RUS]", + "[u]Russian", "\r\n\r\nItalian\r\n", + "Arabic /", + "Descriptions in Other Languages", + "Español /", + "Farsi/", + "Français", + "French - ", + "French / ", + "German/", + "Hindi /", + "Italian / ", + "Italian Summary:", + "Italian/", + "Japanese /", + "Links:", "Pasta-Pizza-Mandolino/Italiano", "Persian /فارسی", - "Farsi/Persian/", - "Polish / polski", - "Polish / Polski", - "Polish Summary / Polski Opis", + "Polish /", + "Polish Summary /", + "Polish/", "Polski", - "Portuguese (BR) / Português", - "Portuguese / Português", - "Português / Portuguese", - "Portuguese / Portugu", - "Portuguese / Português", "Português", - "Portuguese (BR) / Portugu & ecirc;", - "Portuguese (BR) / Portuguê", - "[PTBR]", - "Résume Français", + "Portuguese (BR)", + "Portuguese /", "Résumé Français", - "[b][u]French", - "French / Français", - "Français", - "[hr]Fr:", - "French - Français:", - "Turkish / Türkçe", - "Turkish/Türkçe", + "Résume Français", + "RUS:", + "Russia/", + "Russian /", + "Spanish:", + "Spanish /", + "Spanish Summary:", + "Spanish/", "Türkçe", - "[b][u]Chinese", - "Arabic / العربية", + "Thai:", + "Turkish /", + "Turkish/", + "Русский", "العربية", - "[hr]TH", - "[b][u]Vietnamese", - "[b]Links:", - "[b]Link[/b]", - "Links:", - "[b]External Links" + "정보", + "(zh-Hant)", ) // guess the thumbnail url is .jpg this has a ~80% success rate