From a4d0c214d8b91a20d6ffdf6d63341d26b372f37f Mon Sep 17 00:00:00 2001 From: Gauthier Date: Sat, 30 Jul 2022 11:01:07 +0800 Subject: [PATCH] [Komga] fix default sort and readlist sort (#12782) * fix(komga): default sort broken since Komga 0.155.1 * fix(komga): proper sort criteria for readlists * update CHANGELOG.md * bump version --- src/all/komga/CHANGELOG.md | 9 +++++++++ src/all/komga/build.gradle | 2 +- .../src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/all/komga/CHANGELOG.md b/src/all/komga/CHANGELOG.md index db83eefb7..11b6e8871 100644 --- a/src/all/komga/CHANGELOG.md +++ b/src/all/komga/CHANGELOG.md @@ -1,3 +1,12 @@ +## 1.3.42 + +Minimum Komga version required: `0.151.0` + +### Fix + +* default sort broken since Komga 0.155.1 +* proper sort criteria for readlists + ## 1.3.41 Minimum Komga version required: `0.151.0` diff --git a/src/all/komga/build.gradle b/src/all/komga/build.gradle index 51115f6ff..fca2ff49a 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 = 41 + extVersionCode = 42 } 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 80b865d56..93ba0179c 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 @@ -47,7 +47,7 @@ import java.util.Locale open class Komga(suffix: String = "") : ConfigurableSource, UnmeteredSource, HttpSource() { override fun popularMangaRequest(page: Int): Request = - GET("$baseUrl/api/v1/series?page=${page - 1}&deleted=false", headers) + GET("$baseUrl/api/v1/series?page=${page - 1}&deleted=false&sort=metadata.titleSort,asc", headers) override fun popularMangaParse(response: Response): MangasPage = processSeriesPage(response) @@ -157,7 +157,7 @@ open class Komga(suffix: String = "") : ConfigurableSource, UnmeteredSource, Htt } is Filter.Sort -> { var sortCriteria = when (filter.state?.index) { - 0 -> "metadata.titleSort" + 0 -> if (type == "series") "metadata.titleSort" else "name" 1 -> "createdDate" 2 -> "lastModifiedDate" else -> ""