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

music: only compute song uid once

Browse source
This commit is contained in:
Alexander Capehart 2024-11-27 09:46:59 -07:00
parent dd3b411beb
commit e0bbb88e92
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/oxycblt/auxio/music/stack/interpret/Interpreter.kt
View file

@ -85,7 +85,7 @@ class InterpreterImpl @Inject constructor(private val preparer: Preparer) : Inte
val uidMap = mutableMapOf<Music.UID, SongImpl>() val uidMap = mutableMapOf<Music.UID, SongImpl>()
val songs = val songs =
albumLinkedSongs.mapNotNull { albumLinkedSongs.mapNotNull {
val uid = it.preSong.computeUid() val uid = it.preSong.uid
val other = uidMap[uid] val other = uidMap[uid]
if (other == null) { if (other == null) {
SongImpl(it) SongImpl(it)

2
app/src/main/java/org/oxycblt/auxio/music/stack/interpret/model/DeviceMusicImpl.kt
View file

@ -43,7 +43,7 @@ import org.oxycblt.auxio.util.update
class SongImpl(linkedSong: LinkedSong) : Song { class SongImpl(linkedSong: LinkedSong) : Song {
private val preSong = linkedSong.preSong private val preSong = linkedSong.preSong
override val uid = preSong.computeUid() override val uid = preSong.uid
override val name = preSong.name override val name = preSong.name
override val track = preSong.track override val track = preSong.track
override val disc = preSong.disc override val disc = preSong.disc

2
app/src/main/java/org/oxycblt/auxio/music/stack/interpret/prepare/PreMusic.kt
View file

@ -52,7 +52,7 @@ data class PreSong(
val preArtists: List<PreArtist>, val preArtists: List<PreArtist>,
val preGenres: List<PreGenre> val preGenres: List<PreGenre>
) { ) {
fun computeUid() = val uid =
musicBrainzId?.let { Music.UID.musicBrainz(MusicType.SONGS, it) } musicBrainzId?.let { Music.UID.musicBrainz(MusicType.SONGS, it) }
?: Music.UID.auxio(MusicType.SONGS) { ?: Music.UID.auxio(MusicType.SONGS) {
// Song UIDs are based on the raw data without parsing so that they remain // Song UIDs are based on the raw data without parsing so that they remain