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

music: avoid redundant devicelibrary comparison

Browse source 
Avoid redundantly comparing DeviceLibrary instances based on parent
information already derived from song instances.
This commit is contained in:
Alexander Capehart 2023-06-03 09:02:39 -06:00
parent aae688b642
commit 182883ef2d
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
2 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/org/oxycblt/auxio/music/device/DeviceLibrary.kt
View file

@ -134,21 +134,9 @@ private class DeviceLibraryImpl(rawSongs: List<RawSong>, settings: MusicSettings
private val artistUidMap = buildMap { artists.forEach { put(it.uid, it.finalize()) } } private val artistUidMap = buildMap { artists.forEach { put(it.uid, it.finalize()) } }
private val genreUidMap = buildMap { genres.forEach { put(it.uid, it.finalize()) } } private val genreUidMap = buildMap { genres.forEach { put(it.uid, it.finalize()) } }
override fun equals(other: Any?) = // All other music is built from songs, so comparison only needs to check songs.
other is DeviceLibrary && override fun equals(other: Any?) = other is DeviceLibrary && other.songs == songs
other.songs == songs && override fun hashCode() = songs.hashCode()
other.albums == albums &&
other.artists == artists &&
other.genres == genres
override fun hashCode(): Int {
var hashCode = songs.hashCode()
hashCode = hashCode * 31 + albums.hashCode()
hashCode = hashCode * 31 + artists.hashCode()
hashCode = hashCode * 31 + genres.hashCode()
return hashCode
}
override fun toString() = override fun toString() =
"DeviceLibrary(songs=${songs.size}, albums=${albums.size}, artists=${artists.size}, genres=${genres.size})" "DeviceLibrary(songs=${songs.size}, albums=${albums.size}, artists=${artists.size}, genres=${genres.size})"

2
app/src/main/java/org/oxycblt/auxio/music/device/DeviceModule.kt
View file

@ -26,5 +26,5 @@ import dagger.hilt.components.SingletonComponent
@Module @Module
@InstallIn(SingletonComponent::class) @InstallIn(SingletonComponent::class)
interface DeviceModule { interface DeviceModule {
@Binds fun deviceLibraryProvider(factory: DeviceLibraryFactoryImpl): DeviceLibrary.Factory @Binds fun deviceLibraryFactory(factory: DeviceLibraryFactoryImpl): DeviceLibrary.Factory
} }