feat(data): Add insertAndReplacePlaylist function to handle playlist …

…insertion and replacement (fixed online playlist in Android Auto)
maxrave-dev · Jan 31, 2025 · d620633 · d620633
1 parent 3ce7f1f
commit d620633
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/db/DatabaseDao.kt b/app/src/main/java/com/maxrave/simpmusic/data/db/DatabaseDao.kt
@@ -275,6 +275,9 @@ interface DatabaseDao {
     @Insert(onConflict = OnConflictStrategy.IGNORE)
     suspend fun insertPlaylist(playlist: PlaylistEntity)
 
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAndReplacePlaylist(playlist: PlaylistEntity)
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertRadioPlaylist(playlist: PlaylistEntity)
 

diff --git a/app/src/main/java/com/maxrave/simpmusic/data/db/LocalDataSource.kt b/app/src/main/java/com/maxrave/simpmusic/data/db/LocalDataSource.kt
@@ -142,6 +142,8 @@ class LocalDataSource(
 
     suspend fun insertPlaylist(playlist: PlaylistEntity) = databaseDao.insertPlaylist(playlist)
 
+    suspend fun insertAndReplacePlaylist(playlist: PlaylistEntity) = databaseDao.insertAndReplacePlaylist(playlist)
+
     suspend fun insertRadioPlaylist(playlist: PlaylistEntity) = databaseDao.insertRadioPlaylist(playlist)
 
     suspend fun updatePlaylistLiked(

diff --git a/app/src/main/java/com/maxrave/simpmusic/data/repository/MainRepository.kt b/app/src/main/java/com/maxrave/simpmusic/data/repository/MainRepository.kt
@@ -455,6 +455,11 @@ class MainRepository(
 
     suspend fun insertPlaylist(playlistEntity: PlaylistEntity) = withContext(Dispatchers.IO) { localDataSource.insertPlaylist(playlistEntity) }
 
+    suspend fun insertAndReplacePlaylist(playlistEntity: PlaylistEntity) =
+        withContext(Dispatchers.IO) {
+            localDataSource.insertAndReplacePlaylist(playlistEntity)
+        }
+
     suspend fun insertRadioPlaylist(playlistEntity: PlaylistEntity) =
         withContext(Dispatchers.IO) { localDataSource.insertRadioPlaylist(playlistEntity) }
 

diff --git a/app/src/main/java/com/maxrave/simpmusic/service/SimpleMediaSessionCallback.kt b/app/src/main/java/com/maxrave/simpmusic/service/SimpleMediaSessionCallback.kt
@@ -45,6 +45,7 @@ class SimpleMediaSessionCallback(
     private val context: Context,
     private val mainRepository: MainRepository,
 ) : MediaLibrarySession.Callback {
+    private val tag = "AndroidAuto"
     var toggleLike: () -> Unit = {}
     private val scope = CoroutineScope(Dispatchers.Main + Job())
     private val searchTempList = mutableListOf<Track>()
@@ -293,7 +294,7 @@ class SimpleMediaSessionCallback(
                                         if (playlist.data?.tracks.isNullOrEmpty()) {
                                             emptyList()
                                         } else {
-                                            mainRepository.insertPlaylist(playlist.data!!.toPlaylistEntity())
+                                            mainRepository.insertAndReplacePlaylist(playlist.data!!.toPlaylistEntity())
                                             playlist.data.tracks.map { track ->
                                                 track
                                                     .toSongEntity()
@@ -313,7 +314,7 @@ class SimpleMediaSessionCallback(
                                 if (playlistId != null) {
                                     val playlist =
                                         mainRepository.getLocalPlaylist(playlistId.toLong()).first()
-                                    Log.w("SimpleMediaSessionCallback", "onGetChildren: $playlist")
+                                    Log.w(tag, "onGetChildren: $playlist")
                                     if (playlist.tracks.isNullOrEmpty()) {
                                         emptyList()
                                     } else {
@@ -393,7 +394,7 @@ class SimpleMediaSessionCallback(
                 PLAYLIST -> {
                     val songId = path.getOrNull(2) ?: return@future defaultResult
                     val playlistId = path.getOrNull(1) ?: return@future defaultResult
-                    Log.d("SimpleMediaSessionCallback", "onSetMediaItems: $playlistId")
+                    Log.d("SimpleMediaSessionCallback", "onSetMediaItems playlistId: $playlistId")
                     val songs =
                         mainRepository
                             .getLocalPlaylist(playlistId.toLong())
@@ -402,7 +403,7 @@ class SimpleMediaSessionCallback(
                             ?.let {
                                 mainRepository.getSongsByListVideoId(it)
                             }?.first()
-                    Log.w("SimpleMediaSessionCallback", "onSetMediaItems: $songs")
+                    Log.w("SimpleMediaSessionCallback", "onSetMediaItems songs: $songs")
                     if (songs.isNullOrEmpty()) {
                         defaultResult
                     } else {
@@ -438,16 +439,22 @@ class SimpleMediaSessionCallback(
                     } else if (type == PLAYLIST) {
                         val songId = path.getOrNull(4) ?: return@future defaultResult
                         val playlistId = path.getOrNull(3) ?: return@future defaultResult
+                        Log.d(tag, "onSetMediaItems playlistId: $playlistId")
                         val playlistEntity = mainRepository.getPlaylist(playlistId).first()
+                        Log.w(tag, "onSetMediaItems playlistEntity: $playlistEntity")
                         if (playlistEntity?.tracks.isNullOrEmpty()) {
                             defaultResult
                         } else if (playlistEntity?.tracks?.isNotEmpty() == true) {
                             playlistEntity.tracks
-                                .let { it ->
+                                .let { tracks ->
                                     mainRepository
-                                        .getSongsByListVideoId(it)
+                                        .getSongsByListVideoId(tracks)
                                         .first()
-                                        .map { it.toMediaItem() }
+                                        .sortedBy {
+                                            tracks.indexOf(it.videoId)
+                                        }.also {
+                                            Log.w(tag, "onSetMediaItems list songs: $it")
+                                        }.map { it.toMediaItem() }
                                 }.let { mediaItemList ->
                                     MediaSession.MediaItemsWithStartPosition(
                                         mediaItemList,

diff --git a/app/src/main/java/com/maxrave/simpmusic/ui/fragment/other/LocalPlaylistFragment.kt b/app/src/main/java/com/maxrave/simpmusic/ui/fragment/other/LocalPlaylistFragment.kt
@@ -925,7 +925,8 @@ class LocalPlaylistFragment : Fragment() {
 //                                    binding.btSort.setIconResource(
 //                                        R.drawable.baseline_arrow_drop_down_24,
 //                                    )
-//                                    listTrack.sortBy {
+//                                    listTrack.
+        //                                    sortBy {
 //                                        viewModel.listPair.value?.find {
 //                                                pair ->
 //                                            pair.songId == (it as SongEntity).videoId