Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

musikr: fix crash when no mbids used

Browse source
This commit is contained in:
Alexander Capehart 2024-12-28 15:11:28 -07:00
parent c6dc51659b
commit 7497ff2514
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
musikr/src/main/java/org/oxycblt/musikr/graph/MusicGraph.kt
View file

@ -172,6 +172,10 @@ private class MusicGraphBuilderImpl : MusicGraph.Builder {
} }
private fun meldGenreVertices(src: GenreVertex, dst: GenreVertex) { private fun meldGenreVertices(src: GenreVertex, dst: GenreVertex) {
if (src == dst) {
// Same vertex, do nothing
return
}
// Link all songs and artists from the irrelevant genre to the relevant genre. // Link all songs and artists from the irrelevant genre to the relevant genre.
dst.songVertices.addAll(src.songVertices) dst.songVertices.addAll(src.songVertices)
dst.artistVertices.addAll(src.artistVertices) dst.artistVertices.addAll(src.artistVertices)
@ -229,6 +233,10 @@ private class MusicGraphBuilderImpl : MusicGraph.Builder {
} }
private fun meldArtistVertices(src: ArtistVertex, dst: ArtistVertex) { private fun meldArtistVertices(src: ArtistVertex, dst: ArtistVertex) {
if (src == dst) {
// Same vertex, do nothing
return
}
// Link all songs and albums from the irrelevant artist to the relevant artist. // Link all songs and albums from the irrelevant artist to the relevant artist.
dst.songVertices.addAll(src.songVertices) dst.songVertices.addAll(src.songVertices)
dst.albumVertices.addAll(src.albumVertices) dst.albumVertices.addAll(src.albumVertices)
@ -296,6 +304,10 @@ private class MusicGraphBuilderImpl : MusicGraph.Builder {
} }
private fun meldAlbumVertices(src: AlbumVertex, dst: AlbumVertex) { private fun meldAlbumVertices(src: AlbumVertex, dst: AlbumVertex) {
if (src == dst) {
// Same vertex, do nothing
return
}
// Link all songs and artists from the irrelevant album to the relevant album. // Link all songs and artists from the irrelevant album to the relevant album.
dst.songVertices.addAll(src.songVertices) dst.songVertices.addAll(src.songVertices)
dst.artistVertices.addAll(src.artistVertices) dst.artistVertices.addAll(src.artistVertices)