From 503a4854c3772b5ba6ea4afa9ad859538f06e47c Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Sat, 21 Dec 2024 11:44:42 -0500
Subject: [PATCH] musikr: hide playlist database

---
 app/src/main/java/org/oxycblt/auxio/music/MusicModule.kt   | 4 ++--
 .../main/java/org/oxycblt/auxio/music/MusicRepository.kt   | 7 +++----
 .../org/oxycblt/musikr/playlist/db/PlaylistDatabase.kt     | 4 ++--
 .../java/org/oxycblt/musikr/playlist/db/StoredPlaylists.kt | 5 +++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicModule.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicModule.kt
index f4bd3eb3d..ee6c0a729 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/MusicModule.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/MusicModule.kt
@@ -27,7 +27,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
 import org.oxycblt.musikr.cache.CacheDatabase
-import org.oxycblt.musikr.playlist.db.PlaylistDatabase
+import org.oxycblt.musikr.playlist.db.StoredPlaylists
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -46,5 +46,5 @@ class MusikrShimModule {
 
     @Singleton
     @Provides
-    fun playlistDatabase(@ApplicationContext context: Context) = PlaylistDatabase.from(context)
+    fun storedPlaylists(@ApplicationContext context: Context) = StoredPlaylists.from(context)
 }
diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt
index 8f4f6f2f3..40855f1b1 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt
@@ -39,7 +39,6 @@ import org.oxycblt.musikr.Song
 import org.oxycblt.musikr.Storage
 import org.oxycblt.musikr.cache.Cache
 import org.oxycblt.musikr.cache.CacheDatabase
-import org.oxycblt.musikr.playlist.db.PlaylistDatabase
 import org.oxycblt.musikr.playlist.db.StoredPlaylists
 import org.oxycblt.musikr.tag.interpret.Naming
 import org.oxycblt.musikr.tag.interpret.Separators
@@ -216,7 +215,7 @@ class MusicRepositoryImpl
 constructor(
     @ApplicationContext private val context: Context,
     private val cacheDatabase: CacheDatabase,
-    private val playlistDatabase: PlaylistDatabase,
+    private val storedPlaylists: StoredPlaylists,
     private val musicSettings: MusicSettings
 ) : MusicRepository {
     private val updateListeners = mutableListOf<MusicRepository.UpdateListener>()
@@ -371,14 +370,14 @@ constructor(
                 Storage(
                     Cache.full(cacheDatabase),
                     MutableRevisionedStoredCovers(context, revision),
-                    StoredPlaylists.from(playlistDatabase))
+                    storedPlaylists)
         } else {
             revision = UUID.randomUUID()
             storage =
                 Storage(
                     Cache.writeOnly(cacheDatabase),
                     MutableRevisionedStoredCovers(context, revision),
-                    StoredPlaylists.from(playlistDatabase))
+                    storedPlaylists)
         }
 
         val interpretation = Interpretation(nameFactory, separators)
diff --git a/musikr/src/main/java/org/oxycblt/musikr/playlist/db/PlaylistDatabase.kt b/musikr/src/main/java/org/oxycblt/musikr/playlist/db/PlaylistDatabase.kt
index b3402a6a6..021b01595 100644
--- a/musikr/src/main/java/org/oxycblt/musikr/playlist/db/PlaylistDatabase.kt
+++ b/musikr/src/main/java/org/oxycblt/musikr/playlist/db/PlaylistDatabase.kt
@@ -40,8 +40,8 @@ import org.oxycblt.musikr.Music
     version = 30,
     exportSchema = false)
 @TypeConverters(Music.UID.TypeConverters::class)
-abstract class PlaylistDatabase : RoomDatabase() {
-    internal abstract fun playlistDao(): PlaylistDao
+internal abstract class PlaylistDatabase : RoomDatabase() {
+    abstract fun playlistDao(): PlaylistDao
 
     companion object {
         fun from(context: Context) =
diff --git a/musikr/src/main/java/org/oxycblt/musikr/playlist/db/StoredPlaylists.kt b/musikr/src/main/java/org/oxycblt/musikr/playlist/db/StoredPlaylists.kt
index 9095bbe43..44abce745 100644
--- a/musikr/src/main/java/org/oxycblt/musikr/playlist/db/StoredPlaylists.kt
+++ b/musikr/src/main/java/org/oxycblt/musikr/playlist/db/StoredPlaylists.kt
@@ -18,6 +18,7 @@
  
 package org.oxycblt.musikr.playlist.db
 
+import android.content.Context
 import org.oxycblt.musikr.Music
 import org.oxycblt.musikr.Song
 import org.oxycblt.musikr.playlist.PlaylistFile
@@ -30,8 +31,8 @@ abstract class StoredPlaylists {
     internal abstract suspend fun read(): List<PlaylistFile>
 
     companion object {
-        fun from(database: PlaylistDatabase): StoredPlaylists =
-            StoredPlaylistsImpl(database.playlistDao())
+        fun from(context: Context): StoredPlaylists =
+            StoredPlaylistsImpl(PlaylistDatabase.from(context).playlistDao())
     }
 }