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

[Komga] rework the load of filter values at startup (#9386) 

* rework the load of filter values at startup

* Update CHANGELOG.md
This commit is contained in:
Gauthier 2021-10-07 19:14:08 +08:00 committed by GitHub
parent 0d0f6b5b76
commit 0a0b8bd7a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/all/komga/CHANGELOG.md
View File

@ -1,3 +1,11 @@
## 1.2.34
Minimum Komga version required: `0.113.0`
### Fix
* Loading of filter values could fail in some cases
## 1.2.33
Minimum Komga version required: `0.113.0`
@ -261,4 +269,4 @@ Minimum Komga version required: `0.22.0`
### Features
* first version
* first version

6
src/all/komga/build.gradle
View File

@ -6,12 +6,12 @@ ext {
extName = 'Komga'
pkgNameSuffix = 'all.komga'
extClass = '.KomgaFactory'
extVersionCode = 33
extVersionCode = 34
}
dependencies {
implementation 'io.reactivex:rxandroid:1.2.1'
implementation 'io.reactivex:rxjava:1.3.8'
compileOnly 'io.reactivex:rxandroid:1.2.1'
compileOnly 'io.reactivex:rxjava:1.3.8'
}
apply from: "$rootDir/common.gradle"

104
src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt
View File

@ -33,10 +33,8 @@ import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
import okhttp3.OkHttpClient
import okhttp3.Request
import okhttp3.Response
import okhttp3.ResponseBody
import rx.Observable
import rx.Single
import rx.android.schedulers.AndroidSchedulers
import rx.schedulers.Schedulers
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
@ -457,12 +455,8 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
init {
if (baseUrl.isNotBlank()) {
Single.fromCallable {
client.newCall(GET("$baseUrl/api/v1/libraries", headers)).execute()
}
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
{ response ->
try {
client.newCall(GET("$baseUrl/api/v1/libraries", headers)).execute().use { response ->
libraries = try {
val responseBody = response.body
if (responseBody != null) {
@ -475,19 +469,13 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
Log.e(LOG_TAG, "error while decoding JSON for libraries filter", e)
emptyList()
}
},
{ tr ->
Log.e(LOG_TAG, "error while loading libraries for filters", tr)
}
)
} catch (e: Exception) {
Log.e(LOG_TAG, "error while loading libraries for filters", e)
}
Single.fromCallable {
client.newCall(GET("$baseUrl/api/v1/collections?unpaged=true", headers)).execute()
}
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
{ response ->
try {
client.newCall(GET("$baseUrl/api/v1/collections?unpaged=true", headers)).execute().use { response ->
collections = try {
val responseBody = response.body
if (responseBody != null) {
@ -500,19 +488,13 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
Log.e(LOG_TAG, "error while decoding JSON for collections filter", e)
emptyList()
}
},
{ tr ->
Log.e(LOG_TAG, "error while loading collections for filters", tr)
}
)
} catch (e: Exception) {
Log.e(LOG_TAG, "error while loading collections for filters", e)
}
Single.fromCallable {
client.newCall(GET("$baseUrl/api/v1/genres", headers)).execute()
}
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
{ response ->
try {
client.newCall(GET("$baseUrl/api/v1/genres", headers)).execute().use { response ->
genres = try {
val responseBody = response.body
if (responseBody != null) {
@ -525,19 +507,13 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
Log.e(LOG_TAG, "error while decoding JSON for genres filter", e)
emptySet()
}
},
{ tr ->
Log.e(LOG_TAG, "error while loading genres for filters", tr)
}
)
} catch (e: Exception) {
Log.e(LOG_TAG, "error while loading genres for filters", e)
}
Single.fromCallable {
client.newCall(GET("$baseUrl/api/v1/tags", headers)).execute()
}
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
{ response ->
try {
client.newCall(GET("$baseUrl/api/v1/tags", headers)).execute().use { response ->
tags = try {
val responseBody = response.body
if (responseBody != null) {
@ -550,19 +526,13 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
Log.e(LOG_TAG, "error while decoding JSON for tags filter", e)
emptySet()
}
},
{ tr ->
Log.e(LOG_TAG, "error while loading tags for filters", tr)
}
)
} catch (e: Exception) {
Log.e(LOG_TAG, "error while loading tags for filters", e)
}
Single.fromCallable {
client.newCall(GET("$baseUrl/api/v1/publishers", headers)).execute()
}
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
{ response ->
try {
client.newCall(GET("$baseUrl/api/v1/publishers", headers)).execute().use { response ->
publishers = try {
val responseBody = response.body
if (responseBody != null) {
@ -575,23 +545,17 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
Log.e(LOG_TAG, "error while decoding JSON for publishers filter", e)
emptySet()
}
},
{ tr ->
Log.e(LOG_TAG, "error while loading publishers for filters", tr)
}
)
} catch (e: Exception) {
Log.e(LOG_TAG, "error while loading publishers for filters", e)
}
Single.fromCallable {
client.newCall(GET("$baseUrl/api/v1/authors", headers)).execute()
}
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(
{ response ->
try {
client.newCall(GET("$baseUrl/api/v1/authors", headers)).execute().use { response ->
authors = try {
val responseBody = response.body
if (responseBody != null) {
val list = responseBody.use<ResponseBody, List<AuthorDto>> { json.decodeFromString(it.string()) }
val list: List<AuthorDto> = responseBody.use { json.decodeFromString(it.string()) }
list.groupBy { it.role }
} else {
Log.e(LOG_TAG, "error while decoding JSON for authors filter: response body is null. Response code: ${response.code}")
@ -601,9 +565,17 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
Log.e(LOG_TAG, "error while decoding JSON for authors filter", e)
emptyMap()
}
},
}
} catch (e: Exception) {
Log.e(LOG_TAG, "error while loading authors for filters", e)
}
}
.subscribeOn(Schedulers.io())
.observeOn(Schedulers.io())
.subscribe(
{},
{ tr ->
Log.e(LOG_TAG, "error while loading authors for filters", tr)
Log.e(LOG_TAG, "error while doing initial calls", tr)
}
)
}