Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Populate the ComicInfo Number field with chapter numbers (#9514)

Browse Source 
* Populate the ComicInfo Number field

* added negative number check

(cherry picked from commit b8716ff6fed7fefccd03554337d0ce882f64bed2)
This commit is contained in:
Shamicen 2023-05-20 16:24:10 +02:00 committed by Jobobby04
parent bdf871292b
commit f00e10bda0
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
View File

@ -107,6 +107,7 @@ fun Manga.hasCustomCover(coverCache: CoverCache = Injekt.get()): Boolean {
fun getComicInfo(manga: Manga, chapter: Chapter, chapterUrl: String) = ComicInfo( fun getComicInfo(manga: Manga, chapter: Chapter, chapterUrl: String) = ComicInfo(
title = ComicInfo.Title(chapter.name), title = ComicInfo.Title(chapter.name),
series = ComicInfo.Series(manga.title), series = ComicInfo.Series(manga.title),
number = chapter.chapterNumber.takeIf { it >= 0 }?.let { ComicInfo.Number(it.toString()) },
web = ComicInfo.Web(chapterUrl), web = ComicInfo.Web(chapterUrl),
summary = manga.description?.let { ComicInfo.Summary(it) }, summary = manga.description?.let { ComicInfo.Summary(it) },
writer = manga.author?.let { ComicInfo.Writer(it) }, writer = manga.author?.let { ComicInfo.Writer(it) },

5
core-metadata/src/main/java/tachiyomi/core/metadata/comicinfo/ComicInfo.kt
View File

@ -44,6 +44,7 @@ fun SManga.copyFromComicInfo(comicInfo: ComicInfo) {
data class ComicInfo( data class ComicInfo(
val title: Title?, val title: Title?,
val series: Series?, val series: Series?,
val number: Number?,
val summary: Summary?, val summary: Summary?,
val writer: Writer?, val writer: Writer?,
val penciller: Penciller?, val penciller: Penciller?,
@ -78,6 +79,10 @@ data class ComicInfo(
@XmlSerialName("Series", "", "") @XmlSerialName("Series", "", "")
data class Series(@XmlValue(true) val value: String = "") data class Series(@XmlValue(true) val value: String = "")
@Serializable
@XmlSerialName("Number", "", "")
data class Number(@XmlValue(true) val value: String = "")
@Serializable @Serializable
@XmlSerialName("Summary", "", "") @XmlSerialName("Summary", "", "")
data class Summary(@XmlValue(true) val value: String = "") data class Summary(@XmlValue(true) val value: String = "")