yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Filter out empty genres before saving manga to database (#7655)

Browse Source
This commit is contained in:
stevenyomi 2022-07-31 23:18:12 +08:00 committed by GitHub
parent 58acf0a8aa
commit 4efb736e56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
View File

@ -29,11 +29,6 @@ interface Manga : SManga {
return chapter_flags and DomainManga.CHAPTER_SORT_DIR_MASK.toInt() == DomainManga.CHAPTER_SORT_DESC.toInt() return chapter_flags and DomainManga.CHAPTER_SORT_DIR_MASK.toInt() == DomainManga.CHAPTER_SORT_DESC.toInt()
} }
fun getGenres(): List<String>? {
if (genre.isNullOrBlank()) return null
return genre?.split(", ")?.map { it.trim() }?.filterNot { it.isBlank() }?.distinct()
}
private fun setChapterFlags(flag: Int, mask: Int) { private fun setChapterFlags(flag: Int, mask: Int) {
chapter_flags = chapter_flags and mask.inv() or (flag and mask) chapter_flags = chapter_flags and mask.inv() or (flag and mask)
} }

7
app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt
View File

@ -24,6 +24,11 @@ interface SManga : Serializable {
var initialized: Boolean var initialized: Boolean
fun getGenres(): List<String>? {
if (genre.isNullOrBlank()) return null
return genre?.split(", ")?.map { it.trim() }?.filterNot { it.isBlank() }?.distinct()
}
fun copyFrom(other: SManga) { fun copyFrom(other: SManga) {
if (other.author != null) { if (other.author != null) {
author = other.author author = other.author
@ -102,7 +107,7 @@ fun SManga.toMangaInfo(): MangaInfo {
artist = this.artist ?: "", artist = this.artist ?: "",
author = this.author ?: "", author = this.author ?: "",
description = this.description ?: "", description = this.description ?: "",
genres = this.genre?.split(", ") ?: emptyList(), genres = this.getGenres() ?: emptyList(),
status = this.status, status = this.status,
cover = this.thumbnail_url ?: "", cover = this.thumbnail_url ?: "",
) )