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

music: deduplicate by case

Browse source 
At some point, the switch to keying raw music information broke my
mitigation for duplicate tags that use similar cases. This then
crashed the music loader in certain cases. Fix it by making the
check use raw music keys.

Resolves #614
This commit is contained in:
Alexander Capehart 2023-12-16 13:52:36 -07:00
parent 7a90e7eef1
commit 4421d6cf36
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -150,26 +150,26 @@ class SongImpl(
val artistSortNames = separators.split(rawSong.artistSortNames) val artistSortNames = separators.split(rawSong.artistSortNames)
val rawIndividualArtists = val rawIndividualArtists =
artistNames artistNames
.mapIndexedTo(mutableSetOf()) { i, name -> .mapIndexed { i, name ->
RawArtist( RawArtist(
artistMusicBrainzIds.getOrNull(i)?.toUuidOrNull(), artistMusicBrainzIds.getOrNull(i)?.toUuidOrNull(),
name, name,
artistSortNames.getOrNull(i)) artistSortNames.getOrNull(i))
} }
.toList() .distinctBy { it.key }
val albumArtistMusicBrainzIds = separators.split(rawSong.albumArtistMusicBrainzIds) val albumArtistMusicBrainzIds = separators.split(rawSong.albumArtistMusicBrainzIds)
val albumArtistNames = separators.split(rawSong.albumArtistNames) val albumArtistNames = separators.split(rawSong.albumArtistNames)
val albumArtistSortNames = separators.split(rawSong.albumArtistSortNames) val albumArtistSortNames = separators.split(rawSong.albumArtistSortNames)
val rawAlbumArtists = val rawAlbumArtists =
albumArtistNames albumArtistNames
.mapIndexedTo(mutableSetOf()) { i, name -> .mapIndexed { i, name ->
RawArtist( RawArtist(
albumArtistMusicBrainzIds.getOrNull(i)?.toUuidOrNull(), albumArtistMusicBrainzIds.getOrNull(i)?.toUuidOrNull(),
name, name,
albumArtistSortNames.getOrNull(i)) albumArtistSortNames.getOrNull(i))
} }
.toList() .distinctBy { it.key }
rawAlbum = rawAlbum =
RawAlbum( RawAlbum(
@ -195,10 +195,7 @@ class SongImpl(
val genreNames = val genreNames =
(rawSong.genreNames.parseId3GenreNames() ?: separators.split(rawSong.genreNames)) (rawSong.genreNames.parseId3GenreNames() ?: separators.split(rawSong.genreNames))
rawGenres = rawGenres =
genreNames genreNames.map { RawGenre(it) }.distinctBy { it.key }.ifEmpty { listOf(RawGenre()) }
.mapTo(mutableSetOf()) { RawGenre(it) }
.toList()
.ifEmpty { listOf(RawGenre()) }
hashCode = 31 * hashCode + rawSong.hashCode() hashCode = 31 * hashCode + rawSong.hashCode()
hashCode = 31 * hashCode + nameFactory.hashCode() hashCode = 31 * hashCode + nameFactory.hashCode()