Draff
/
Tachiyomi-Extensions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Asura Scans: Update permanent url logic (#10233) 

* Asura Scans: Update permanent url logic

* Bump Version

* Fix Stuff
This commit is contained in:
FourTOne5 2021-12-27 17:05:29 +06:00 committed by GitHub
parent e9962b9b30
commit 2a1eaf5314
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
multisrc/overrides/wpmangastream/asurascans/src/AsuraScans.kt
View File

@ -40,6 +40,7 @@ open class AsuraScans(
.addInterceptor(RateLimitInterceptor(1, 3, TimeUnit.SECONDS)) .addInterceptor(RateLimitInterceptor(1, 3, TimeUnit.SECONDS))
.build() .build()
// Permanent Url for Manga/Chapter End
override fun fetchPopularManga(page: Int): Observable<MangasPage> { override fun fetchPopularManga(page: Int): Observable<MangasPage> {
return super.fetchPopularManga(page).tempUrlToPermIfNeeded() return super.fetchPopularManga(page).tempUrlToPermIfNeeded()
} }
@ -62,7 +63,7 @@ open class AsuraScans(
} }
private fun SManga.tempUrlToPermIfNeeded(): SManga { private fun SManga.tempUrlToPermIfNeeded(): SManga {
val turnTempUrlToPerm = preferences.getBoolean(getPermanentMangaUrlPreferenceKey(), false) val turnTempUrlToPerm = preferences.getBoolean(getPermanentMangaUrlPreferenceKey(), true)
if (!turnTempUrlToPerm) return this if (!turnTempUrlToPerm) return this
val sMangaTitleFirstWord = this.title.split(" ")[0] val sMangaTitleFirstWord = this.title.split(" ")[0]
@ -73,20 +74,20 @@ open class AsuraScans(
} }
override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> { override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> {
manga.tempUrlToPermIfNeeded() val sManga = manga.tempUrlToPermIfNeeded()
return super.fetchChapterList(manga).map { sChapterList -> return super.fetchChapterList(sManga).map { sChapterList ->
sChapterList.map { it.tempUrlToPermIfNeeded(manga) } sChapterList.map { it.tempUrlToPermIfNeeded(sManga) }
} }
} }
private fun SChapter.tempUrlToPermIfNeeded(manga: SManga): SChapter { private fun SChapter.tempUrlToPermIfNeeded(manga: SManga): SChapter {
val turnTempUrlToPerm = preferences.getBoolean(getPermanentChapterUrlPreferenceKey(), false) val turnTempUrlToPerm = preferences.getBoolean(getPermanentChapterUrlPreferenceKey(), true)
if (!turnTempUrlToPerm) return this if (!turnTempUrlToPerm) return this
val sChapterNameFirstWord = this.name.split(" ")[0] val sChapterNameFirstWord = this.name.split(" ")[0]
val sMangaTitleFirstWord = manga.title.split(" ")[0] val sMangaTitleFirstWord = manga.title.split(" ")[0]
if ( if (
!this.url.contains("/$sChapterNameFirstWord", ignoreCase = true) || !this.url.contains("/$sChapterNameFirstWord", ignoreCase = true) &&
!this.url.contains("/$sMangaTitleFirstWord", ignoreCase = true) !this.url.contains("/$sMangaTitleFirstWord", ignoreCase = true)
) { ) {
this.url = this.url.replaceFirst(TEMP_TO_PERM_URL_REGEX, "$1") this.url = this.url.replaceFirst(TEMP_TO_PERM_URL_REGEX, "$1")

2
multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/wpmangastream/WPMangaStreamGenerator.kt
View File

@ -13,7 +13,7 @@ class WPMangaStreamGenerator : ThemeSourceGenerator {
override val baseVersionCode: Int = 12 override val baseVersionCode: Int = 12
override val sources = listOf( 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("Infernal Void Scans", "https://infernalvoidscans.com", "en", overrideVersionCode = 2),
SingleLang("KlanKomik", "https://klankomik.com", "id", overrideVersionCode = 1), SingleLang("KlanKomik", "https://klankomik.com", "id", overrideVersionCode = 1),
SingleLang("Kombatch", "https://kombatch.com", "id"), SingleLang("Kombatch", "https://kombatch.com", "id"),