better volume cover fallback

Snd-R · Feb 19, 2023 · 2e54e53 · 2e54e53
1 parent 3c9748e
commit 2e54e53
Showing 1 changed file with 22 additions and 11 deletions.
diff --git a/src/main/kotlin/org/snd/metadata/providers/mangadex/MangaDexMetadataMapper.kt b/src/main/kotlin/org/snd/metadata/providers/mangadex/MangaDexMetadataMapper.kt
@@ -98,21 +98,22 @@ class MangaDexMetadataMapper(
             links = links
         )
 
-        val coversByLocale = covers.groupBy { it.locale }
+        // TODO configurable language
+        val books = covers.groupBy { it.volume }.values
+            .map { byVolume ->
+                byVolume.groupBy { it.locale }
+                    .mapValues { (_, value) -> value.firstOrNull() }
+            }
+            .mapNotNull { byLocale ->
+                (byLocale["en"] ?: byLocale["jp"] ?: byLocale.values.firstOrNull())
+                    ?.let { coverArtToBook(it) }
+            }
+
         return MetadataConfigApplier.apply(
             ProviderSeriesMetadata(
                 id = ProviderSeriesId(manga.id.id),
                 metadata = metadata,
-                // TODO configurable language
-                books = (coversByLocale["en"] ?: coversByLocale["ja"] ?: coversByLocale.values.firstOrNull())?.map { coverArt ->
-                    SeriesBook(
-                        id = ProviderBookId(coverArt.fileName),
-                        number = coverArt.volume?.toDoubleOrNull()?.let { BookRange(it, it) },
-                        name = coverArt.volume,
-                        type = null,
-                        edition = null
-                    )
-                } ?: emptyList()
+                books = books
             ),
             seriesMetadataConfig
         )
@@ -128,4 +129,14 @@ class MangaDexMetadataMapper(
 
         return MetadataConfigApplier.apply(providerMetadata, bookMetadataConfig)
     }
+
+    private fun coverArtToBook(coverArt: MangaDexCoverArt): SeriesBook {
+        return SeriesBook(
+            id = ProviderBookId(coverArt.fileName),
+            number = coverArt.volume?.toDoubleOrNull()?.let { BookRange(it, it) },
+            name = coverArt.volume,
+            type = null,
+            edition = null
+        )
+    }
 }