fix: series genre is not imported from metadata

This commit is contained in:
Gauthier Roebroeck 2020-08-27 14:35:09 +08:00
parent f4451bfd41
commit d0815dd80e
4 changed files with 5 additions and 5 deletions

View file

@ -9,7 +9,7 @@ data class SeriesMetadataPatch(
val publisher: String?,
val ageRating: Int?,
val language: String?,
val genres: Set<String>,
val genres: Set<String>?,
val collections: List<String>
)

View file

@ -134,7 +134,7 @@ class MetadataLifecycle(
title = patches.mostFrequent { it.title },
titleSort = patches.mostFrequent { it.titleSort },
status = patches.mostFrequent { it.status },
genres = patches.flatMap { it.genres }.toSet(),
genres = patches.mapNotNull { it.genres }.flatten().toSet(),
language = patches.mostFrequent { it.language },
summary = null,
readingDirection = patches.mostFrequent { it.readingDirection },

View file

@ -73,7 +73,7 @@ class ComicInfoProvider(
else -> null
}
val genres = comicInfo.genre?.split(',')?.map { it.trim() }?.toSet() ?: emptySet()
val genres = comicInfo.genre?.split(',')?.map { it.trim() }?.toSet()
return SeriesMetadataPatch(
title = comicInfo.series,

View file

@ -88,8 +88,8 @@ class EpubMetadataProvider(
publisher = publisher,
ageRating = null,
summary = null,
language = if(language != null && BCP47TagValidator.isValid(language)) language else null,
genres = if(genre != null) setOf(genre) else emptySet(),
language = if (language != null && BCP47TagValidator.isValid(language)) language else null,
genres = genre?.let { setOf(genre) },
collections = emptyList()
)
}