From bc49af1d14d016dd4ee8d7fca140b67ab8eaaa53 Mon Sep 17 00:00:00 2001
From: Gauthier <gotson@users.noreply.github.com>
Date: Fri, 20 Mar 2020 17:47:21 +0800
Subject: [PATCH] use Book title instead of name (#2459)

use Book numberSort instead of number
---
 src/all/komga/build.gradle                    |  2 +-
 .../tachiyomi/extension/all/komga/Komga.kt    |  4 +--
 .../tachiyomi/extension/all/komga/dto/Dto.kt  | 29 ++++++++++++++++++-
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/all/komga/build.gradle b/src/all/komga/build.gradle
index 4f336ee09..689b55fa3 100644
--- a/src/all/komga/build.gradle
+++ b/src/all/komga/build.gradle
@@ -5,7 +5,7 @@ ext {
     appName = 'Tachiyomi: Komga'
     pkgNameSuffix = 'all.komga'
     extClass = '.Komga'
-    extVersionCode = 7
+    extVersionCode = 8
     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 2ba28b00e..24700515e 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
@@ -99,8 +99,8 @@ open class Komga : ConfigurableSource, HttpSource() {
 
         return page.content.map { book ->
             SChapter.create().apply {
-                chapter_number = book.number
-                name = "${book.name} (${book.size})"
+                chapter_number = book.metadata.numberSort
+                name = "${book.metadata.title} (${book.size})"
                 url = "$baseUrl/api/v1/books/${book.id}"
                 date_upload = parseDate(book.lastModified)
             }
diff --git a/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/dto/Dto.kt b/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/dto/Dto.kt
index 0138550a7..c001520a3 100644
--- a/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/dto/Dto.kt
+++ b/src/all/komga/src/eu/kanade/tachiyomi/extension/all/komga/dto/Dto.kt
@@ -34,7 +34,8 @@ data class BookDto(
     val fileLastModified: String,
     val sizeBytes: Long,
     val size: String,
-    val media: MediaDto
+    val media: MediaDto,
+    val metadata: BookMetadataDto
 )
 
 data class MediaDto(
@@ -48,3 +49,29 @@ data class PageDto(
     val fileName: String,
     val mediaType: String
 )
+
+data class BookMetadataDto(
+    val title: String,
+    val titleLock: Boolean,
+    val summary: String,
+    val summaryLock: Boolean,
+    val number: String,
+    val numberLock: Boolean,
+    val numberSort: Float,
+    val numberSortLock: Boolean,
+    val readingDirection: String,
+    val readingDirectionLock: Boolean,
+    val publisher: String,
+    val publisherLock: Boolean,
+    val ageRating: Int?,
+    val ageRatingLock: Boolean,
+    val releaseDate: String?,
+    val releaseDateLock: Boolean,
+    val authors: List<AuthorDto>,
+    val authorsLock: Boolean
+)
+
+data class AuthorDto(
+    val name: String,
+    val role: String
+)