[Komga] API update + Sort options (#1946)

* use updated Komga API (closes gotson/komga#31, closes gotson/komga#32)

* only retrieve books in READY state (was previously handled server side by default)

* add sort options to Series search (closes gotson/komga#33)

src/all/komga/build.gradle

@@ -5,7 +5,7 @@ ext {
     appName = 'Tachiyomi: Komga'
     pkgNameSuffix = 'all.komga'
     extClass = '.Komga'
-    extVersionCode = 4
+    extVersionCode = 5
     libVersion = '1.2'
 }
 

src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/Komga.kt

@@ -51,6 +51,18 @@ open class Komga : ConfigurableSource, HttpSource() {
                         url.addQueryParameter("library_id", libraryToInclude.joinToString(","))
                     }
                 }
+                is Filter.Sort -> {
+                    var sortCriteria = when (filter.state?.index) {
+                        0 -> "name"
+                        1 -> "createdDate"
+                        2 -> "lastModifiedDate"
+                        else -> ""
+                    }
+                    if (sortCriteria.isNotEmpty()) {
+                        sortCriteria += "," + if (filter.state?.ascending!!) "asc" else "desc"
+                        url.addQueryParameter("sort", sortCriteria)
+                    }
+                }
             }
         }
 
@@ -69,18 +81,16 @@ open class Komga : ConfigurableSource, HttpSource() {
     }
 
     override fun chapterListRequest(manga: SManga): Request =
-        GET("$baseUrl${manga.url}/books?size=1000", headers)
+        GET("$baseUrl${manga.url}/books?size=1000&media_status=READY", headers)
 
     override fun chapterListParse(response: Response): List<SChapter> {
         val page = gson.fromJson<PageWrapperDto<BookDto>>(response.body()?.charStream()!!)
-        val chapterListUrl = response.request().url().newBuilder()
-            .removeAllQueryParameters("size").build().toString()
 
-        return page.content.mapIndexed { i, book ->
+        return page.content.map { book ->
             SChapter.create().apply {
-                chapter_number = (i + 1).toFloat()
+                chapter_number = book.number
                 name = "${book.name} (${book.size})"
-                url = "$chapterListUrl/${book.id}"
+                url = "$baseUrl/api/v1/books/${book.id}"
                 date_upload = parseDate(book.lastModified)
             }
         }.sortedByDescending { it.chapter_number }
@@ -115,9 +125,9 @@ open class Komga : ConfigurableSource, HttpSource() {
 
     private fun SeriesDto.toSManga(): SManga =
         SManga.create().apply {
-            title = this@toSManga.name
+            title = name
-            url = "/api/v1/series/${this@toSManga.id}"
+            url = "/api/v1/series/${id}"
-            thumbnail_url = "$baseUrl/api/v1/series/${this@toSManga.id}/thumbnail"
+            thumbnail_url = "$baseUrl/api/v1/series/${id}/thumbnail"
             status = SManga.UNKNOWN
         }
 
@@ -140,10 +150,12 @@ open class Komga : ConfigurableSource, HttpSource() {
 
     private class LibraryFilter(val id: Long, name: String) : Filter.CheckBox(name, false)
     private class LibraryGroup(libraries: List<LibraryFilter>) : Filter.Group<LibraryFilter>("Libraries", libraries)
+    private class SeriesSort : Filter.Sort("Sort", arrayOf("Alphabetically", "Date added", "Date updated"), Filter.Sort.Selection(0, true))
 
     override fun getFilterList(): FilterList =
         FilterList(
-            LibraryGroup(libraries.map { LibraryFilter(it.id, it.name) }.sortedBy { it.name })
+            LibraryGroup(libraries.map { LibraryFilter(it.id, it.name) }.sortedBy { it.name }),
+            SeriesSort()
         )
 
     private var libraries = emptyList<LibraryDto>()

src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/dto/Dto.kt

@@ -7,22 +7,31 @@ data class LibraryDto(
 
 data class SeriesDto(
     val id: Long,
+    val libraryId: Long,
     val name: String,
-    val lastModified: String?
+    val created: String?,
+    val lastModified: String?,
+    val fileLastModified: String,
+    val booksCount: Int
 )
 
 data class BookDto(
     val id: Long,
+    val seriesId: Long,
     val name: String,
+    val number: Float,
+    val created: String?,
     val lastModified: String?,
+    val fileLastModified: String,
     val sizeBytes: Long,
     val size: String,
-    val metadata: BookMetadataDto
+    val media: MediaDto
 )
 
-data class BookMetadataDto(
+data class MediaDto(
     val status: String,
-    val mediaType: String
+    val mediaType: String,
+    val pagesCount: Int
 )
 
 data class PageDto(