From 9952579cc4d4ca699d12bc92fbb959cfda099906 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Mon, 6 Jan 2025 08:28:56 -0700 Subject: [PATCH] musikr.tag: fix correction creating empty tag lists --- .../oxycblt/musikr/metadata/NativeTagMap.kt | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/musikr/src/main/java/org/oxycblt/musikr/metadata/NativeTagMap.kt b/musikr/src/main/java/org/oxycblt/musikr/metadata/NativeTagMap.kt index dd78da17a..0e04519b2 100644 --- a/musikr/src/main/java/org/oxycblt/musikr/metadata/NativeTagMap.kt +++ b/musikr/src/main/java/org/oxycblt/musikr/metadata/NativeTagMap.kt @@ -28,7 +28,14 @@ internal class NativeTagMap { } fun addID(id: String, values: List) { - map[id] = values.mapNotNull { it.correctWhitespace() } + if (values.isEmpty()) { + return + } + val correctedValues = values.mapNotNull { it.correctWhitespace() } + if (correctedValues.isEmpty()) { + return + } + map[id] = correctedValues } fun addCustom(description: String, value: String) { @@ -36,7 +43,14 @@ internal class NativeTagMap { } fun addCustom(description: String, values: List) { - map[description.uppercase()] = values.mapNotNull { it.correctWhitespace() } + if (values.isEmpty()) { + return + } + val correctedValues = values.mapNotNull { it.correctWhitespace() } + if (correctedValues.isEmpty()) { + return + } + map[description.uppercase()] = correctedValues } fun addCombined(id: String, description: String, value: String) { @@ -44,7 +58,14 @@ internal class NativeTagMap { } fun addCombined(id: String, description: String, values: List) { - map["$id:${description.uppercase()}"] = values.mapNotNull { it.correctWhitespace() } + if (values.isEmpty()) { + return + } + val correctedValues = values.mapNotNull { it.correctWhitespace() } + if (correctedValues.isEmpty()) { + return + } + map["$id:${description.uppercase()}"] = correctedValues } fun getObject(): Map> {