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

music: finalize duplicate tags fix

Browse source 
Officially finalize the fix for #484, at least I think.

Resolves #484.
This commit is contained in:
Alexander Capehart 2023-06-26 17:56:48 -06:00
parent a1ab6d139a
commit f8a0a42dd3
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -8,6 +8,7 @@
#### What's Improved #### What's Improved
- `album artists` and `(album)artists sort` are now recognized - `album artists` and `(album)artists sort` are now recognized
- Increased distinction from shuffle on/off icons
#### What's Fixed #### What's Fixed
- Fixed an issue where the queue sheet would not collapse when scrolling - Fixed an issue where the queue sheet would not collapse when scrolling

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

@ -39,7 +39,6 @@ import org.oxycblt.auxio.music.info.ReleaseType
import org.oxycblt.auxio.music.metadata.parseId3GenreNames import org.oxycblt.auxio.music.metadata.parseId3GenreNames
import org.oxycblt.auxio.music.metadata.parseMultiValue import org.oxycblt.auxio.music.metadata.parseMultiValue
import org.oxycblt.auxio.playback.replaygain.ReplayGainAdjustment import org.oxycblt.auxio.playback.replaygain.ReplayGainAdjustment
import org.oxycblt.auxio.util.logD
import org.oxycblt.auxio.util.nonZeroOrNull import org.oxycblt.auxio.util.nonZeroOrNull
import org.oxycblt.auxio.util.toUuidOrNull import org.oxycblt.auxio.util.toUuidOrNull
import org.oxycblt.auxio.util.unlikelyToBeNull import org.oxycblt.auxio.util.unlikelyToBeNull
@ -224,7 +223,7 @@ class SongImpl(private val rawSong: RawSong, musicSettings: MusicSettings) : Son
} }
check(_genres.isNotEmpty()) { "Malformed song: No genres" } check(_genres.isNotEmpty()) { "Malformed song: No genres" }
check(_genres.size == rawGenres.size) { "Malformed song: Genre grouping mismatch"} 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.
@ -342,7 +341,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" } check(_artists.size == rawArtists.size) { "Malformed album: 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.