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

music: handle duplicate artist/genre values

Browse source 
Remove functionally duplicate artist/genre values that were read from
a file.

This caused a indexer crash in 3.1.2 due to the switch to music sets,
which no longer made duplicate values group the song twice. This then
cascaded to a failure in song finalization, as it expects there to be
the same amount of artists/genres as raw artists/genres.
This commit is contained in:
Alexander Capehart 2023-06-25 16:46:21 -06:00
parent 5bda85fe36
commit 6f6a3d8d31
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/org/oxycblt/auxio/music/device/DeviceMusicImpl.kt
View file

@ -152,6 +152,7 @@ class SongImpl(private val rawSong: RawSong, musicSettings: MusicSettings) : Son
rawArtists = rawArtists =
rawAlbumArtists rawAlbumArtists
.ifEmpty { rawIndividualArtists } .ifEmpty { rawIndividualArtists }
.distinctBy { it.key }
.ifEmpty { listOf(RawArtist(null, null)) }) .ifEmpty { listOf(RawArtist(null, null)) })
/** /**
@ -160,7 +161,10 @@ class SongImpl(private val rawSong: RawSong, musicSettings: MusicSettings) : Son
* [RawArtist]. This can be used to group up [Song]s into an [Artist]. * [RawArtist]. This can be used to group up [Song]s into an [Artist].
*/ */
val rawArtists = val rawArtists =
rawIndividualArtists.ifEmpty { rawAlbumArtists }.ifEmpty { listOf(RawArtist()) } rawIndividualArtists
.ifEmpty { rawAlbumArtists }
.distinctBy { it.key }
.ifEmpty { listOf(RawArtist()) }
/** /**
* The [RawGenre] instances collated by the [Song]. This can be used to group up [Song]s into a * The [RawGenre] instances collated by the [Song]. This can be used to group up [Song]s into a
@ -170,6 +174,7 @@ class SongImpl(private val rawSong: RawSong, musicSettings: MusicSettings) : Son
rawSong.genreNames rawSong.genreNames
.parseId3GenreNames(musicSettings) .parseId3GenreNames(musicSettings)
.map { RawGenre(it) } .map { RawGenre(it) }
.distinctBy { it.key }
.ifEmpty { listOf(RawGenre()) } .ifEmpty { listOf(RawGenre()) }
/** /**
@ -208,6 +213,7 @@ class SongImpl(private val rawSong: RawSong, musicSettings: MusicSettings) : Son
checkNotNull(_album) { "Malformed song: No album" } checkNotNull(_album) { "Malformed song: No album" }
check(_artists.isNotEmpty()) { "Malformed song: No artists" } check(_artists.isNotEmpty()) { "Malformed song: No artists" }
check(_artists.size == rawArtists.size) { "Malformed song: Artist grouping mismatch" }
for (i in _artists.indices) { for (i in _artists.indices) {
// Non-destructively reorder the linked artists so that they align with // Non-destructively reorder the linked artists so that they align with
// the artist ordering within the song metadata. // the artist ordering within the song metadata.
@ -218,7 +224,7 @@ class SongImpl(private val rawSong: RawSong, musicSettings: MusicSettings) : Son
} }
check(_genres.isNotEmpty()) { "Malformed song: No genres" } check(_genres.isNotEmpty()) { "Malformed song: No genres" }
logD("$this $rawGenres $_genres]") check(_genres.size == rawGenres.size) { "Malformed song: Genre grouping mismatch"}
for (i in _genres.indices) { for (i in _genres.indices) {
// Non-destructively reorder the linked genres so that they align with // Non-destructively reorder the linked genres so that they align with
// the genre ordering within the song metadata. // the genre ordering within the song metadata.
@ -336,6 +342,7 @@ class AlbumImpl(
fun finalize(): Album { fun finalize(): Album {
check(songs.isNotEmpty()) { "Malformed album: Empty" } check(songs.isNotEmpty()) { "Malformed album: Empty" }
check(_artists.isNotEmpty()) { "Malformed album: No artists" } check(_artists.isNotEmpty()) { "Malformed album: No artists" }
check(_artists.size == rawArtists.size) { "Malformed song: Artist grouping mismatch" }
for (i in _artists.indices) { for (i in _artists.indices) {
// Non-destructively reorder the linked artists so that they align with // Non-destructively reorder the linked artists so that they align with
// the artist ordering within the song metadata. // the artist ordering within the song metadata.