fix readlist chapters sort (#6944)

This commit is contained in:
Gauthier 2021-05-10 18:52:45 +08:00 committed by GitHub
parent 618c557f19
commit c4f382f0dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 5 deletions

View File

@ -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` Minimum Komga version required: `0.87.4`

View File

@ -5,7 +5,7 @@ ext {
extName = 'Komga' extName = 'Komga'
pkgNameSuffix = 'all.komga' pkgNameSuffix = 'all.komga'
extClass = '.KomgaFactory' extClass = '.KomgaFactory'
extVersionCode = 24 extVersionCode = 25
libVersion = '1.2' libVersion = '1.2'
} }

View File

@ -179,16 +179,16 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() {
override fun chapterListParse(response: Response): List<SChapter> { override fun chapterListParse(response: Response): List<SChapter> {
val page = gson.fromJson<PageWrapperDto<BookDto>>(response.body?.charStream()!!).content val page = gson.fromJson<PageWrapperDto<BookDto>>(response.body?.charStream()!!).content
val r = page.map { book -> val r = page.mapIndexed { index, book ->
SChapter.create().apply { 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})" name = "${if (!response.fromReadList()) "${book.metadata.number} - " else ""}${book.metadata.title} (${book.size})"
url = "$baseUrl/api/v1/books/${book.id}" url = "$baseUrl/api/v1/books/${book.id}"
date_upload = book.metadata.releaseDate?.let { parseDate(it) } date_upload = book.metadata.releaseDate?.let { parseDate(it) }
?: parseDateTime(book.fileLastModified) ?: 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 = override fun pageListRequest(chapter: SChapter): Request =