diff --git a/src/all/jable/build.gradle b/src/all/jable/build.gradle index f9304496..7a977015 100644 --- a/src/all/jable/build.gradle +++ b/src/all/jable/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Jable' extClass = '.JableFactory' - extVersionCode = 1 + extVersionCode = 2 isNsfw = true } diff --git a/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/Jable.kt b/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/Jable.kt index d8b3bc20..930ca50a 100644 --- a/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/Jable.kt +++ b/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/Jable.kt @@ -35,7 +35,7 @@ class Jable(override val lang: String) : AnimeHttpSource() { private var tagsUpdated = false override fun animeDetailsRequest(anime: SAnime): Request { - return GET("$baseUrl${anime.url}?lang=$lang", headers) + return GET("$baseUrl${anime.url}?lang=${lang.toRequestLang()}", headers) } override fun animeDetailsParse(response: Response): SAnime { @@ -88,7 +88,7 @@ class Jable(override val lang: String) : AnimeHttpSource() { title = it.select(".detail .title").text() } }, - doc.select(".container .pagination .page-item .page-link.disabled").isNullOrEmpty(), + true, ) } @@ -125,7 +125,7 @@ class Jable(override val lang: String) : AnimeHttpSource() { ): Request { val urlBuilder = baseUrl.toHttpUrl().newBuilder() .addPathSegments("$path/") - .addQueryParameter("lang", lang) + .addQueryParameter("lang", lang.toRequestLang()) if (tagsUpdated) { // load whole page for update filter tags info urlBuilder.addQueryParameter("mode", "async") @@ -204,6 +204,11 @@ class Jable(override val lang: String) : AnimeHttpSource() { return false } + private fun String.toRequestLang(): String { + if (this == "ja") return "jp" + return this + } + private val intl by lazy { JableIntl(lang) } diff --git a/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/JableFactory.kt b/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/JableFactory.kt index 6faa9a12..91a86e2e 100644 --- a/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/JableFactory.kt +++ b/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/JableFactory.kt @@ -8,7 +8,7 @@ class JableFactory : AnimeSourceFactory { return listOf( Jable("zh"), Jable("en"), - Jable("jp"), + Jable("ja"), ) } } diff --git a/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/JableIntl.kt b/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/JableIntl.kt index 9fe6f869..29932cf9 100644 --- a/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/JableIntl.kt +++ b/src/all/jable/src/eu/kanade/tachiyomi/animeextension/all/jable/JableIntl.kt @@ -20,7 +20,7 @@ internal class JableIntl private constructor(delegate: Intl) : Intl by delegate constructor(lang: String) : this( when (lang) { "zh" -> ZH() - "jp" -> JP() + "ja" -> JA() "en" -> EN() else -> ZH() }, @@ -43,7 +43,7 @@ internal class ZH : Intl { override val filterTagTitle: String = "標籤" } -internal class JP : Intl { +internal class JA : Intl { override val popular: String = "人気優先" override val latestUpdate: String = "新作優先" override val sortLatestUpdate: String = "最近更新"