diff --git a/src/all/komga/CHANGELOG.md b/src/all/komga/CHANGELOG.md index c7ccca1f7..f160dafbc 100644 --- a/src/all/komga/CHANGELOG.md +++ b/src/all/komga/CHANGELOG.md @@ -1,3 +1,13 @@ +## 1.2.30 + +Minimum Komga version required: `0.113.0` + +### Features + +* display read list summary +* display aggregated tags on series +* search series by book tags + ## 1.2.29 Minimum Komga version required: `0.97.0` diff --git a/src/all/komga/build.gradle b/src/all/komga/build.gradle index 2f610042a..eeb523c29 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 = 29 + extVersionCode = 30 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 bec0f70d5..3627babd3 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 @@ -243,7 +243,7 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() { "ENDED" -> SManga.COMPLETED else -> SManga.UNKNOWN } - genre = (metadata.genres + metadata.tags).joinToString(", ") + genre = (metadata.genres + metadata.tags + booksMetadata.tags).distinct().joinToString(", ") description = metadata.summary.ifBlank { booksMetadata.summary } booksMetadata.authors.groupBy { it.role }.let { map -> author = map["writer"]?.map { it.name }?.distinct()?.joinToString() @@ -254,6 +254,7 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() { private fun ReadListDto.toSManga(): SManga = SManga.create().apply { title = name + description = summary url = "$baseUrl/api/v1/readlists/$id" thumbnail_url = "$url/thumbnail" status = SManga.UNKNOWN @@ -473,7 +474,7 @@ open class Komga(suffix: String = "") : ConfigurableSource, HttpSource() { ) Single.fromCallable { - client.newCall(GET("$baseUrl/api/v1/tags/series", headers)).execute() + client.newCall(GET("$baseUrl/api/v1/tags", headers)).execute() } .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) 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 41a2c4cfb..a2e001d5d 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 @@ -41,6 +41,7 @@ data class SeriesMetadataDto( data class BookMetadataAggregationDto( val authors: List = emptyList(), + val tags: Set = emptySet(), val releaseDate: String?, val summary: String, val summaryNumber: String, @@ -108,6 +109,7 @@ data class CollectionDto( data class ReadListDto( val id: String, val name: String, + val summary: String, val bookIds: List, val createdDate: String, val lastModifiedDate: String,