From 97bd2597280de30128152373ec5a3460bf92c7e8 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Wed, 22 Jan 2025 12:57:11 -0700 Subject: [PATCH] musikr: handle duplicate playlist songs in graph Accidentally flattened these out during graphing. --- .../src/main/java/org/oxycblt/musikr/graph/MusicGraph.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/musikr/src/main/java/org/oxycblt/musikr/graph/MusicGraph.kt b/musikr/src/main/java/org/oxycblt/musikr/graph/MusicGraph.kt index 1b7b2f910..9496ab961 100644 --- a/musikr/src/main/java/org/oxycblt/musikr/graph/MusicGraph.kt +++ b/musikr/src/main/java/org/oxycblt/musikr/graph/MusicGraph.kt @@ -141,10 +141,7 @@ private class MusicGraphBuilderImpl : MusicGraph.Builder { playlistVertices.forEach { val pointer = SongPointer.UID(entry.key) - val index = it.pointerMap[pointer] - if (index != null) { - it.songVertices[index] = vertex - } + it.pointerMap[pointer]?.forEach { index -> it.songVertices[index] = vertex } } } @@ -373,7 +370,7 @@ internal class PlaylistVertex(val prePlaylist: PrePlaylist) { val pointerMap = prePlaylist.songPointers .withIndex() - .associateBy { it.value } - .mapValuesTo(mutableMapOf()) { it.value.index } + .groupBy { it.value } + .mapValuesTo(mutableMapOf()) { entry -> entry.value.map { it.index } } val tag: Any? = null }