mirror of
				https://github.com/mihonapp/mihon.git
				synced 2025-11-03 23:58:55 +01:00 
			
		
		
		
	Filter out empty genres before saving manga to database (#7655)
(cherry picked from commit 4efb736e56)
			
			
This commit is contained in:
		@@ -32,11 +32,6 @@ interface Manga : SManga {
 | 
			
		||||
        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) {
 | 
			
		||||
        chapter_flags = chapter_flags and mask.inv() or (flag and mask)
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -23,6 +23,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
 | 
			
		||||
@@ -73,7 +78,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 ?: "",
 | 
			
		||||
    )
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user