Bladeren bron

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

stevenyomi 2 jaren geleden
bovenliggende
commit
4efb736e56

+ 0 - 5
app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt

@@ -29,11 +29,6 @@ interface Manga : SManga {
         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) {
         chapter_flags = chapter_flags and mask.inv() or (flag and mask)
     }

+ 6 - 1
app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt

@@ -24,6 +24,11 @@ interface SManga : Serializable {
 
     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) {
         if (other.author != null) {
             author = other.author
@@ -102,7 +107,7 @@ fun SManga.toMangaInfo(): MangaInfo {
         artist = this.artist ?: "",
         author = this.author ?: "",
         description = this.description ?: "",
-        genres = this.genre?.split(", ") ?: emptyList(),
+        genres = this.getGenres() ?: emptyList(),
         status = this.status,
         cover = this.thumbnail_url ?: "",
     )