musikr: fix equality issues

app/src/main/java/org/oxycblt/auxio/image/covers/SiloedCovers.kt

@@ -82,7 +82,8 @@ private constructor(
     }
 }
 
-class SiloedCover(silo: CoverSilo, val innerCover: FileCover) : FileCover by innerCover {
+data class SiloedCover(private val silo: CoverSilo, val innerCover: FileCover) :
+    FileCover by innerCover {
     private val innerId = SiloedCoverId(silo, innerCover.id)
     override val id = innerId.toString()
 }

app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt

@@ -396,12 +396,33 @@ constructor(
         // Music loading completed, update the revision right now so we re-use this work
         // later.
         musicSettings.revision = newRevision
+        // Deliver the library to the rest of the app
+        // This will more or less block until all required item translation and
+        // cleanup finishes.
+        emitLibrary(newLibrary)
+        // Old cover revisions may be lying around, even during a normal refresh due
+        // to really lucky cancellations. Now that it is impossible for the rest of
+        // the app to possible be using them, clean them up.
+        covers.cleanup(newLibrary.songs.mapNotNull { it.cover })
+        // Finish up loading.
+        emitIndexingCompletion(null)
+    }
 
-        // We want to make sure that all reads and writes are synchronized due to the sheer
-        // amount of consumers of MusicRepository.
-        // TODO: Would Atomics not be a better fit here?
+    private suspend fun emitIndexingProgress(progress: IndexingProgress) {
+        yield()
+        synchronized(this) {
+            currentIndexingState = IndexingState.Indexing(progress)
+            for (listener in indexingListeners) {
+                listener.onIndexingStateChanged()
+            }
+        }
+    }
+
+    private suspend fun emitLibrary(newLibrary: MutableLibrary) {
         val deviceLibraryChanged: Boolean
         val userLibraryChanged: Boolean
+        // We want to make sure that all reads and writes are synchronized due to the sheer
+        // amount of consumers of MusicRepository.
         synchronized(this) {
             // It's possible that this reload might have changed nothing, so make sure that
             // hasn't happened before dispatching a change to all consumers.
@@ -428,23 +449,6 @@ constructor(
         withContext(Dispatchers.Main) {
             dispatchLibraryChange(deviceLibraryChanged, userLibraryChanged)
         }
-
-        // Old cover revisions may be lying around, even during a normal refresh due
-        // to really lucky cancellations. Clean those up now that it's impossible for
-        // the rest of the app to be using them.
-        covers.cleanup(newLibrary.songs.mapNotNull { it.cover })
-
-        emitIndexingCompletion(null)
-    }
-
-    private suspend fun emitIndexingProgress(progress: IndexingProgress) {
-        yield()
-        synchronized(this) {
-            currentIndexingState = IndexingState.Indexing(progress)
-            for (listener in indexingListeners) {
-                listener.onIndexingStateChanged()
-            }
-        }
     }
 
     private suspend fun emitIndexingCompletion(error: Exception?) {

musikr/src/main/java/org/oxycblt/musikr/cover/Covers.kt

@@ -43,6 +43,10 @@ interface Cover {
 }
 
 class CoverCollection private constructor(val covers: List<Cover>) {
+    override fun hashCode() = covers.hashCode()
+
+    override fun equals(other: Any?) = other is CoverCollection && covers == other.covers
+
     companion object {
         fun from(covers: Collection<Cover>) =
             CoverCollection(

musikr/src/main/java/org/oxycblt/musikr/cover/FileCovers.kt

@@ -57,7 +57,8 @@ interface FileCover : Cover {
     suspend fun fd(): ParcelFileDescriptor?
 }
 
-private class FileCoverImpl(override val id: String, private val appFile: AppFile) : FileCover {
+private data class FileCoverImpl(override val id: String, private val appFile: AppFile) :
+    FileCover {
     override suspend fun fd() = appFile.fd()
 
     override suspend fun open() = appFile.open()

musikr/src/main/java/org/oxycblt/musikr/fs/app/AppFiles.kt

@@ -96,7 +96,7 @@ private class AppFilesImpl(private val dir: File) : AppFiles {
     }
 }
 
-private class AppFileImpl(private val file: File) : AppFile {
+private data class AppFileImpl(private val file: File) : AppFile {
     override suspend fun fd() =
         withContext(Dispatchers.IO) {
             try {

musikr/src/main/java/org/oxycblt/musikr/model/AlbumImpl.kt

@@ -29,7 +29,7 @@ import org.oxycblt.musikr.util.update
 
 internal interface AlbumCore {
     val preAlbum: PreAlbum
-    val songs: List<Song>
+    val songs: Set<Song>
 
     fun resolveArtists(): List<Artist>
 }
@@ -39,7 +39,7 @@ internal interface AlbumCore {
  *
  * @author Alexander Capehart (OxygenCobalt)
  */
-internal class AlbumImpl(private val core: AlbumCore) : Album {
+class AlbumImpl internal constructor(private val core: AlbumCore) : Album {
     private val preAlbum = core.preAlbum
 
     override val uid =
@@ -73,4 +73,6 @@ internal class AlbumImpl(private val core: AlbumCore) : Album {
         other is AlbumImpl && uid == other.uid && preAlbum == other.preAlbum && songs == other.songs
 
     override fun toString() = "Album(uid=$uid, name=$name)"
+
+    fun a(other: AlbumImpl) = uid == other.uid
 }

musikr/src/main/java/org/oxycblt/musikr/model/LibraryFactory.kt

@@ -87,7 +87,7 @@ private class LibraryFactoryImpl() : LibraryFactory {
     private class AlbumVertexCore(private val vertex: AlbumVertex) : AlbumCore {
         override val preAlbum = vertex.preAlbum
 
-        override val songs = vertex.songVertices.map { SongImpl(SongVertexCore(it)) }
+        override val songs = vertex.songVertices.mapTo(mutableSetOf()) { it.tag as Song }
 
         override fun resolveArtists() = vertex.artistVertices.map { it.tag as Artist }
     }