From 2a1eaf531471ba7460ae411598f06ef8d06cc5e7 Mon Sep 17 00:00:00 2001 From: FourTOne5 <59261191+FourTOne5@users.noreply.github.com> Date: Mon, 27 Dec 2021 17:05:29 +0600 Subject: [PATCH] Asura Scans: Update permanent url logic (#10233) * Asura Scans: Update permanent url logic * Bump Version * Fix Stuff --- .../wpmangastream/asurascans/src/AsuraScans.kt | 13 +++++++------ .../wpmangastream/WPMangaStreamGenerator.kt | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/multisrc/overrides/wpmangastream/asurascans/src/AsuraScans.kt b/multisrc/overrides/wpmangastream/asurascans/src/AsuraScans.kt index 60fd2c723..ff7fbbae5 100644 --- a/multisrc/overrides/wpmangastream/asurascans/src/AsuraScans.kt +++ b/multisrc/overrides/wpmangastream/asurascans/src/AsuraScans.kt @@ -40,6 +40,7 @@ open class AsuraScans( .addInterceptor(RateLimitInterceptor(1, 3, TimeUnit.SECONDS)) .build() + // Permanent Url for Manga/Chapter End override fun fetchPopularManga(page: Int): Observable { return super.fetchPopularManga(page).tempUrlToPermIfNeeded() } @@ -62,7 +63,7 @@ open class AsuraScans( } private fun SManga.tempUrlToPermIfNeeded(): SManga { - val turnTempUrlToPerm = preferences.getBoolean(getPermanentMangaUrlPreferenceKey(), false) + val turnTempUrlToPerm = preferences.getBoolean(getPermanentMangaUrlPreferenceKey(), true) if (!turnTempUrlToPerm) return this val sMangaTitleFirstWord = this.title.split(" ")[0] @@ -73,20 +74,20 @@ open class AsuraScans( } override fun fetchChapterList(manga: SManga): Observable> { - manga.tempUrlToPermIfNeeded() - return super.fetchChapterList(manga).map { sChapterList -> - sChapterList.map { it.tempUrlToPermIfNeeded(manga) } + val sManga = manga.tempUrlToPermIfNeeded() + return super.fetchChapterList(sManga).map { sChapterList -> + sChapterList.map { it.tempUrlToPermIfNeeded(sManga) } } } private fun SChapter.tempUrlToPermIfNeeded(manga: SManga): SChapter { - val turnTempUrlToPerm = preferences.getBoolean(getPermanentChapterUrlPreferenceKey(), false) + val turnTempUrlToPerm = preferences.getBoolean(getPermanentChapterUrlPreferenceKey(), true) if (!turnTempUrlToPerm) return this val sChapterNameFirstWord = this.name.split(" ")[0] val sMangaTitleFirstWord = manga.title.split(" ")[0] if ( - !this.url.contains("/$sChapterNameFirstWord", ignoreCase = true) || + !this.url.contains("/$sChapterNameFirstWord", ignoreCase = true) && !this.url.contains("/$sMangaTitleFirstWord", ignoreCase = true) ) { this.url = this.url.replaceFirst(TEMP_TO_PERM_URL_REGEX, "$1") diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt index f436fda13..65bbb0ef0 100644 --- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt +++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt @@ -13,7 +13,7 @@ class WPMangaStreamGenerator : ThemeSourceGenerator { override val baseVersionCode: Int = 12 override val sources = listOf( - MultiLang("Asura Scans", "https://www.asurascans.com", listOf("en", "tr"), className = "AsuraScansFactory", pkgName = "asurascans", overrideVersionCode = 9), + MultiLang("Asura Scans", "https://www.asurascans.com", listOf("en", "tr"), className = "AsuraScansFactory", pkgName = "asurascans", overrideVersionCode = 10), SingleLang("Infernal Void Scans", "https://infernalvoidscans.com", "en", overrideVersionCode = 2), SingleLang("KlanKomik", "https://klankomik.com", "id", overrideVersionCode = 1), SingleLang("Kombatch", "https://kombatch.com", "id"),