From c4f382f0dc699ee784758eb12d598e67183d75a3 Mon Sep 17 00:00:00 2001
From: Gauthier <gotson@users.noreply.github.com>
Date: Mon, 10 May 2021 18:52:45 +0800
Subject: [PATCH] fix readlist chapters sort (#6944)
---
src/all/komga/CHANGELOG.md | 11 ++++++++++-
src/all/komga/build.gradle | 2 +-
.../eu/kanade/tachiyomi/extension/all/komga/Komga.kt | 6 +++---
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/all/komga/CHANGELOG.md b/src/all/komga/CHANGELOG.md
index f583176ce..5430984a8 100644
--- a/src/all/komga/CHANGELOG.md
+++ b/src/all/komga/CHANGELOG.md
@@ -1,4 +1,13 @@
-## 1.2.23
+## 1.2.25
+
+Minimum Komga version required: `0.87.4`
+
+### Fix
+
+* sort order for read list books
+
+
+## 1.2.24
Minimum Komga version required: `0.87.4`
diff --git a/src/all/komga/build.gradle b/src/all/komga/build.gradle
index 606dee084..a4f1689e3 100644
--- a/src/all/komga/build.gradle
+++ b/src/all/komga/build.gradle
@@ -5,7 +5,7 @@ ext {
extName = 'Komga'
pkgNameSuffix = 'all.komga'
extClass = '.KomgaFactory'
- extVersionCode = 24
+ extVersionCode = 25
libVersion = '1.2'
}
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 d5aa41e72..87a5abb10 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
@@ -179,16 +179,16 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
override fun chapterListParse(response: Response): List<SChapter> {
val page = gson.fromJson<PageWrapperDto<BookDto>>(response.body?.charStream()!!).content
- val r = page.map { book ->
+ val r = page.mapIndexed { index, book ->
SChapter.create().apply {
- chapter_number = book.metadata.numberSort
+ chapter_number = if (!response.fromReadList()) book.metadata.numberSort else index + 1F
name = "${if (!response.fromReadList()) "${book.metadata.number} - " else ""}${book.metadata.title} (${book.size})"
url = "$baseUrl/api/v1/books/${book.id}"
date_upload = book.metadata.releaseDate?.let { parseDate(it) }
?: parseDateTime(book.fileLastModified)
}
}
- return if (!response.fromReadList()) r.sortedByDescending { it.chapter_number } else r.reversed()
+ return r.sortedByDescending { it.chapter_number }
}
override fun pageListRequest(chapter: SChapter): Request =