From 3d690eb637cd9e503583f7de74832ca299c64d82 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Wed, 8 Jan 2025 17:17:05 -0700 Subject: [PATCH] musikr: fix graphing error w/certain link steps I wasn't correctly linking genres, which would cascade to a dead vertex down the line. Will need better diagnostics here. --- musikr/src/main/java/org/oxycblt/musikr/graph/MusicGraph.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 4b33dc966..ebf3101a9 100644 --- a/musikr/src/main/java/org/oxycblt/musikr/graph/MusicGraph.kt +++ b/musikr/src/main/java/org/oxycblt/musikr/graph/MusicGraph.kt @@ -18,6 +18,7 @@ package org.oxycblt.musikr.graph +import android.util.Log import org.oxycblt.musikr.Music import org.oxycblt.musikr.playlist.SongPointer import org.oxycblt.musikr.playlist.interpret.PrePlaylist @@ -148,12 +149,14 @@ private class MusicGraphBuilderImpl : MusicGraph.Builder { } } - return MusicGraph( + val graph = MusicGraph( songVertices.values.toList(), albumVertices.values.toList(), artistVertices.values.toList(), genreVertices.values.toList(), playlistVertices) + + return graph } private fun simplifyGenreCluster(cluster: Collection) { @@ -240,6 +243,7 @@ private class MusicGraphBuilderImpl : MusicGraph.Builder { // Link all songs and albums from the irrelevant artist to the relevant artist. dst.songVertices.addAll(src.songVertices) dst.albumVertices.addAll(src.albumVertices) + dst.genreVertices.addAll(src.genreVertices) // Update all songs, albums, and genres to point to the relevant artist. src.songVertices.forEach { val index = it.artistVertices.indexOf(src)