diff --git a/src/all/komga/CHANGELOG.md b/src/all/komga/CHANGELOG.md index f2c3eb6c3..258a8e6fe 100644 --- a/src/all/komga/CHANGELOG.md +++ b/src/all/komga/CHANGELOG.md @@ -1,3 +1,12 @@ +## 1.4.46 + +Minimum Komga version required: `0.151.0` + +### Feat + +* Update to extension-lib 1.4 + - Clicking on chapter WebView should now open the chapter/book page. + ## 1.3.45 Minimum Komga version required: `0.151.0` diff --git a/src/all/komga/build.gradle b/src/all/komga/build.gradle index 117947ef3..f0308a18f 100644 --- a/src/all/komga/build.gradle +++ b/src/all/komga/build.gradle @@ -6,7 +6,7 @@ ext { extName = 'Komga' pkgNameSuffix = 'all.komga' extClass = '.KomgaFactory' - extVersionCode = 45 + extVersionCode = 46 } dependencies { diff --git a/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt b/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt index 893a6a7ce..6bcaa7a76 100644 --- a/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt +++ b/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt @@ -243,6 +243,10 @@ open class Komga(private val suffix: String = "") : ConfigurableSource, Unmetere } } + override fun getMangaUrl(manga: SManga) = manga.url.replace("/api/v1", "") + + override fun getChapterUrl(chapter: SChapter) = chapter.url.replace("/api/v1/books", "/book") + private fun processSeriesPage(response: Response): MangasPage { val responseBody = response.body return responseBody.use { body -> @@ -525,12 +529,7 @@ open class Komga(private val suffix: String = "") : ConfigurableSource, Unmetere client.newCall(GET("$baseUrl/api/v1/libraries", headers)).execute().use { response -> libraries = try { val responseBody = response.body - if (responseBody != null) { - responseBody.use { json.decodeFromString(it.string()) } - } else { - Log.e(LOG_TAG, "error while decoding JSON for libraries filter: response body is null. Response code: ${response.code}") - emptyList() - } + responseBody.use { json.decodeFromString(it.string()) } } catch (e: Exception) { Log.e(LOG_TAG, "error while decoding JSON for libraries filter", e) emptyList() @@ -544,12 +543,7 @@ open class Komga(private val suffix: String = "") : ConfigurableSource, Unmetere client.newCall(GET("$baseUrl/api/v1/collections?unpaged=true", headers)).execute().use { response -> collections = try { val responseBody = response.body - if (responseBody != null) { - responseBody.use { json.decodeFromString>(it.string()).content } - } else { - Log.e(LOG_TAG, "error while decoding JSON for collections filter: response body is null. Response code: ${response.code}") - emptyList() - } + responseBody.use { json.decodeFromString>(it.string()).content } } catch (e: Exception) { Log.e(LOG_TAG, "error while decoding JSON for collections filter", e) emptyList() @@ -563,12 +557,7 @@ open class Komga(private val suffix: String = "") : ConfigurableSource, Unmetere client.newCall(GET("$baseUrl/api/v1/genres", headers)).execute().use { response -> genres = try { val responseBody = response.body - if (responseBody != null) { - responseBody.use { json.decodeFromString(it.string()) } - } else { - Log.e(LOG_TAG, "error while decoding JSON for genres filter: response body is null. Response code: ${response.code}") - emptySet() - } + responseBody.use { json.decodeFromString(it.string()) } } catch (e: Exception) { Log.e(LOG_TAG, "error while decoding JSON for genres filter", e) emptySet()