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

Fix potential crash when fetching filters (#11419)

Browse Source 
* Comicklive: fix crash on filters

* Kagane: fix crash on filters
This commit is contained in:
AwkwardPeak7 2025-11-05 19:53:56 +05:00 committed by Draff
parent 9f7b11fc57
commit 4c7f5d6a37
Signed by: Draff
GPG Key ID: E8A89F3211677653
4 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/all/comicklive/build.gradle
View File

@ -1,7 +1,7 @@
ext { ext {
extName = 'Comick (Unoriginal)' extName = 'Comick (Unoriginal)'
extClass = '.ComickFactory' extClass = '.ComickFactory'
extVersionCode = 1 extVersionCode = 2
isNsfw = true isNsfw = true
} }

22
src/all/comicklive/src/eu/kanade/tachiyomi/extension/all/comicklive/Comick.kt
View File

@ -19,16 +19,17 @@ import keiyoushi.utils.firstInstanceOrNull
import keiyoushi.utils.getPreferences import keiyoushi.utils.getPreferences
import keiyoushi.utils.parseAs import keiyoushi.utils.parseAs
import keiyoushi.utils.tryParse import keiyoushi.utils.tryParse
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import okhttp3.CacheControl import okhttp3.CacheControl
import okhttp3.Call
import okhttp3.Callback
import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.HttpUrl.Companion.toHttpUrl
import okhttp3.Request import okhttp3.Request
import okhttp3.Response import okhttp3.Response
import okhttp3.brotli.BrotliInterceptor import okhttp3.brotli.BrotliInterceptor
import okhttp3.internal.closeQuietly import okhttp3.internal.closeQuietly
import okio.IOException
import org.jsoup.Jsoup import org.jsoup.Jsoup
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Locale import java.util.Locale
@ -222,11 +223,18 @@ class Comick(
// the cache only request fails if it was not cached already // the cache only request fails if it was not cached already
if (!response.isSuccessful) { if (!response.isSuccessful) {
CoroutineScope(Dispatchers.IO).launch { metadataClient.newCall(
metadataClient.newCall( GET("$baseUrl/api/metadata", headers, CacheControl.FORCE_NETWORK),
GET("$baseUrl/api/metadata", headers, CacheControl.FORCE_NETWORK), ).enqueue(
).await().closeQuietly() object : Callback {
} override fun onResponse(call: Call, response: Response) {
response.closeQuietly()
}
override fun onFailure(call: Call, e: IOException) {
Log.e(name, "Unable to fetch filters", e)
}
},
)
filters.addAll( filters.addAll(
index = 0, index = 0,

2
src/en/kagane/build.gradle
View File

@ -1,7 +1,7 @@
ext { ext {
extName = 'Kagane' extName = 'Kagane'
extClass = '.Kagane' extClass = '.Kagane'
extVersionCode = 8 extVersionCode = 9
isNsfw = true isNsfw = true
} }

21
src/en/kagane/src/eu/kanade/tachiyomi/extension/en/kagane/Kagane.kt
View File

@ -30,13 +30,13 @@ import eu.kanade.tachiyomi.source.online.HttpSource
import keiyoushi.utils.getPreferencesLazy import keiyoushi.utils.getPreferencesLazy
import keiyoushi.utils.parseAs import keiyoushi.utils.parseAs
import keiyoushi.utils.toJsonString import keiyoushi.utils.toJsonString
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import kotlinx.serialization.json.buildJsonObject import kotlinx.serialization.json.buildJsonObject
import kotlinx.serialization.json.put import kotlinx.serialization.json.put
import okhttp3.CacheControl import okhttp3.CacheControl
import okhttp3.Call
import okhttp3.Callback
import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.HttpUrl.Companion.toHttpUrl
import okhttp3.Interceptor import okhttp3.Interceptor
import okhttp3.MediaType.Companion.toMediaType import okhttp3.MediaType.Companion.toMediaType
@ -495,11 +495,18 @@ class Kagane : HttpSource(), ConfigurableSource {
// the cache only request fails if it was not cached already // the cache only request fails if it was not cached already
if (!response.isSuccessful) { if (!response.isSuccessful) {
CoroutineScope(Dispatchers.IO).launch { metadataClient.newCall(
metadataClient.newCall( GET("$apiUrl/api/v1/metadata", headers, CacheControl.FORCE_NETWORK),
GET("$apiUrl/api/v1/metadata", headers, CacheControl.FORCE_NETWORK), ).enqueue(
).await().closeQuietly() object : Callback {
} override fun onResponse(call: Call, response: Response) {
response.closeQuietly()
}
override fun onFailure(call: Call, e: IOException) {
Log.e(name, "Failed to fetch filters", e)
}
},
)
filters.addAll( filters.addAll(
index = 0, index = 0,