Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-17 19:59:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
(cherry picked from commit 4efb736e56)
This commit is contained in:
stevenyomi 2022-07-31 23:18:12 +08:00 committed by arkon
parent b3a11eca0f
commit 09a3509d79
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

@ -32,11 +32,6 @@ interface Manga : SManga {
return chapter_flags and CHAPTER_SORT_MASK == CHAPTER_SORT_DESC return chapter_flags and CHAPTER_SORT_MASK == CHAPTER_SORT_DESC
} }
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

@ -23,6 +23,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
@ -73,7 +78,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 ?: "",
) )