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

IkigaiMangas: Update domain and fix preference (#7061) 

* fix pref

* opa

* cache prefs

* lint
This commit is contained in:
bapeey 2025-01-08 09:06:05 -05:00 committed by Draff
parent 7fc0445474
commit bcfcc110aa
No known key found for this signature in database
GPG Key ID: E8A89F3211677653
2 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/es/ikigaimangas/build.gradle
View File

@ -1,7 +1,7 @@
ext { ext {
extName = 'Ikigai Mangas' extName = 'Ikigai Mangas'
extClass = '.IkigaiMangas' extClass = '.IkigaiMangas'
extVersionCode = 20 extVersionCode = 21
isNsfw = true isNsfw = true
} }

50
src/es/ikigaimangas/src/eu/kanade/tachiyomi/extension/es/ikigaimangas/IkigaiMangas.kt
View File

@ -37,27 +37,27 @@ class IkigaiMangas : HttpSource(), ConfigurableSource {
override val baseUrl get() = when { override val baseUrl get() = when {
isCi -> defaultBaseUrl isCi -> defaultBaseUrl
else -> preferences.getPrefBaseUrl() else -> preferences.prefBaseUrl
} }
private val defaultBaseUrl: String = "https://lectorikigai.bakeni.net" private val defaultBaseUrl: String = "https://visorikigai.tvsin.com"
private val fetchedDomainUrl: String by lazy { private val fetchedDomainUrl: String by lazy {
if (!preferences.fetchDomainPref()) preferences.getPrefBaseUrl() if (!preferences.fetchDomainPref()) return@lazy preferences.prefBaseUrl
try { try {
val initClient = network.cloudflareClient val initClient = network.cloudflareClient
val headers = super.headersBuilder().build() val headers = super.headersBuilder().build()
val document = initClient.newCall(GET("https://ikigaimangas.com", headers)).execute().asJsoup() val document = initClient.newCall(GET("https://ikigaimangas.com", headers)).execute().asJsoup()
val scriptUrl = document.selectFirst("div[on:click]:containsOwn(Nuevo dominio)")?.attr("on:click") val scriptUrl = document.selectFirst("div[on:click]:containsOwn(Nuevo dominio)")?.attr("on:click")
?: preferences.getPrefBaseUrl() ?: return@lazy preferences.prefBaseUrl
val script = initClient.newCall(GET("https://ikigaimangas.com/build/$scriptUrl", headers)).execute().body.string() val script = initClient.newCall(GET("https://ikigaimangas.com/build/$scriptUrl", headers)).execute().body.string()
val domain = script.substringAfter("window.open(\"").substringBefore("\"") val domain = script.substringAfter("window.open(\"").substringBefore("\"")
val host = initClient.newCall(GET(domain, headers)).execute().request.url.host val host = initClient.newCall(GET(domain, headers)).execute().request.url.host
val newDomain = "https://$host" val newDomain = "https://$host"
preferences.edit().putString(BASE_URL_PREF, newDomain).apply() preferences.prefBaseUrl = newDomain
newDomain newDomain
} catch (e: Exception) { } catch (e: Exception) {
preferences.getPrefBaseUrl() preferences.prefBaseUrl
} }
} }
@ -104,7 +104,7 @@ class IkigaiMangas : HttpSource(), ConfigurableSource {
val apiUrl = "$apiBaseUrl/api/swf/series/ranking-list".toHttpUrl().newBuilder() val apiUrl = "$apiBaseUrl/api/swf/series/ranking-list".toHttpUrl().newBuilder()
.addQueryParameter("type", "total_ranking") .addQueryParameter("type", "total_ranking")
.addQueryParameter("series_type", "comic") .addQueryParameter("series_type", "comic")
.addQueryParameter("nsfw", if (preferences.showNsfwPref()) "true" else "false") .addQueryParameter("nsfw", if (preferences.showNsfwPref) "true" else "false")
return GET(apiUrl.build(), lazyHeaders) return GET(apiUrl.build(), lazyHeaders)
} }
@ -117,7 +117,7 @@ class IkigaiMangas : HttpSource(), ConfigurableSource {
override fun latestUpdatesRequest(page: Int): Request { override fun latestUpdatesRequest(page: Int): Request {
val apiUrl = "$apiBaseUrl/api/swf/new-chapters".toHttpUrl().newBuilder() val apiUrl = "$apiBaseUrl/api/swf/new-chapters".toHttpUrl().newBuilder()
.addQueryParameter("nsfw", if (preferences.showNsfwPref()) "true" else "false") .addQueryParameter("nsfw", if (preferences.showNsfwPref) "true" else "false")
.addQueryParameter("page", page.toString()) .addQueryParameter("page", page.toString())
return GET(apiUrl.build(), lazyHeaders) return GET(apiUrl.build(), lazyHeaders)
@ -138,7 +138,7 @@ class IkigaiMangas : HttpSource(), ConfigurableSource {
apiUrl.addQueryParameter("page", page.toString()) apiUrl.addQueryParameter("page", page.toString())
apiUrl.addQueryParameter("type", "comic") apiUrl.addQueryParameter("type", "comic")
apiUrl.addQueryParameter("nsfw", if (preferences.showNsfwPref()) "true" else "false") apiUrl.addQueryParameter("nsfw", if (preferences.showNsfwPref) "true" else "false")
val genres = filters.firstInstanceOrNull<GenreFilter>()?.state.orEmpty() val genres = filters.firstInstanceOrNull<GenreFilter>()?.state.orEmpty()
.filter(Genre::state) .filter(Genre::state)
@ -165,7 +165,7 @@ class IkigaiMangas : HttpSource(), ConfigurableSource {
return MangasPage(mangaList, result.hasNextPage()) return MangasPage(mangaList, result.hasNextPage())
} }
override fun getMangaUrl(manga: SManga) = preferences.getPrefBaseUrl() + manga.url.substringBefore("#").replace("/series/comic-", "/series/") override fun getMangaUrl(manga: SManga) = preferences.prefBaseUrl + manga.url.substringBefore("#").replace("/series/comic-", "/series/")
override fun mangaDetailsRequest(manga: SManga): Request { override fun mangaDetailsRequest(manga: SManga): Request {
val slug = manga.url val slug = manga.url
@ -180,7 +180,7 @@ class IkigaiMangas : HttpSource(), ConfigurableSource {
return result.series.toSMangaDetails() return result.series.toSMangaDetails()
} }
override fun getChapterUrl(chapter: SChapter) = preferences.getPrefBaseUrl() + chapter.url.substringBefore("#") override fun getChapterUrl(chapter: SChapter) = preferences.prefBaseUrl + chapter.url.substringBefore("#")
override fun chapterListRequest(manga: SManga): Request { override fun chapterListRequest(manga: SManga): Request {
val slug = manga.url.substringAfter("/series/comic-").substringBefore("#") val slug = manga.url.substringAfter("/series/comic-").substringBefore("#")
@ -301,10 +301,34 @@ class IkigaiMangas : HttpSource(), ConfigurableSource {
}.also { screen.addPreference(it) } }.also { screen.addPreference(it) }
} }
private fun SharedPreferences.showNsfwPref() = getBoolean(SHOW_NSFW_PREF, SHOW_NSFW_PREF_DEFAULT)
private fun SharedPreferences.getPrefBaseUrl() = getString(BASE_URL_PREF, defaultBaseUrl)!!
private fun SharedPreferences.fetchDomainPref() = getBoolean(FETCH_DOMAIN_PREF, FETCH_DOMAIN_PREF_DEFAULT) private fun SharedPreferences.fetchDomainPref() = getBoolean(FETCH_DOMAIN_PREF, FETCH_DOMAIN_PREF_DEFAULT)
private var _cachedBaseUrl: String? = null
private var SharedPreferences.prefBaseUrl: String
get() {
if (_cachedBaseUrl == null) {
_cachedBaseUrl = getString(BASE_URL_PREF, defaultBaseUrl)!!
}
return _cachedBaseUrl!!
}
set(value) {
_cachedBaseUrl = value
edit().putString(BASE_URL_PREF, value).apply()
}
private var _cachedNsfwPref: Boolean? = null
private var SharedPreferences.showNsfwPref: Boolean
get() {
if (_cachedNsfwPref == null) {
_cachedNsfwPref = getBoolean(SHOW_NSFW_PREF, SHOW_NSFW_PREF_DEFAULT)
}
return _cachedNsfwPref!!
}
set(value) {
_cachedNsfwPref = value
edit().putBoolean(SHOW_NSFW_PREF, value).apply()
}
private inline fun <reified R> List<*>.firstInstanceOrNull(): R? = private inline fun <reified R> List<*>.firstInstanceOrNull(): R? =
filterIsInstance<R>().firstOrNull() filterIsInstance<R>().firstOrNull()