Disliked filter for playlists, albums and home songs

composeApp/src/androidMain/kotlin/it/fast4x/rimusic/Database.kt

@@ -1341,6 +1341,9 @@ interface Database {
     @Query("SELECT likedAt FROM Song WHERE id = :songId")
     fun likedAt(songId: String): Flow<Long?>
 
+    @Query("SELECT likedAt FROM Song WHERE id = :songId")
+    fun getLikedAt(songId: String): Long?
+
     @Query("UPDATE Album SET bookmarkedAt = :bookmarkedAt WHERE id = :id")
     fun bookmarkAlbum(id: String, bookmarkedAt: Long?): Int
 
@@ -1988,6 +1991,18 @@ interface Database {
     """)
     fun sortSongsFromPlaylistByDuration( id: Long ): Flow<List<SongEntity>>
 
+    @Query("""
+        SELECT DISTINCT S.*, Album.title as albumTitle, Format.contentLength as contentLength
+        FROM Song S 
+        INNER JOIN songplaylistmap SP ON S.id = SP.songId 
+        LEFT JOIN SongAlbumMap ON SongAlbumMap.songId = S.id 
+        LEFT JOIN Album ON Album.id = SongAlbumMap.albumId
+        LEFT JOIN Format ON Format.songId = S.id
+        WHERE SP.playlistId = :id 
+        ORDER BY S.thumbnailUrl
+    """)
+    fun sortSongsFromPlaylistByUrl( id: Long ): Flow<List<SongEntity>>
+
     @Query("""
         SELECT DISTINCT S.*, A.title as albumTitle, Format.contentLength as contentLength
         FROM Song S 
@@ -2050,6 +2065,7 @@ interface Database {
             PlaylistSongSortBy.Duration -> sortSongsFromPlaylistByDuration( id )
             PlaylistSongSortBy.DateLiked -> sortSongsFromPlaylistByLikedAt( id )
             PlaylistSongSortBy.DateAdded -> sortSongsFromPlaylistByRowId( id )
+            PlaylistSongSortBy.UnmatchedSongs -> sortSongsFromPlaylistByUrl(id)
         }.map {
             it.run {
                 if( sortOrder == SortOrder.Descending )
@@ -2067,6 +2083,10 @@ interface Database {
     @Query("SELECT SP.position FROM Song S INNER JOIN songplaylistmap SP ON S.id=SP.songId WHERE SP.playlistId=:id AND S.id NOT LIKE '$LOCAL_KEY_PREFIX%' ORDER BY SP.position")
     fun songsPlaylistMap(id: Long): Flow<List<Int>>
 
+    @Transaction
+    @Query("SELECT id FROM SONG WHERE likedAt IS NOT NULL AND likedAt < 0")
+    fun dislikedSongsById(): Flow<List<String>>
+
     @SuppressWarnings(RoomWarnings.QUERY_MISMATCH)
     @Transaction
     @Query("SELECT id, name, browseId, (SELECT COUNT(*) FROM SongPlaylistMap WHERE playlistId = id) as songCount FROM Playlist WHERE id=:id")

composeApp/src/androidMain/kotlin/it/fast4x/rimusic/enums/PlaylistSongSortBy.kt

@@ -34,7 +34,9 @@ enum class PlaylistSongSortBy(
 
     DateLiked( R.string.sort_date_liked, R.drawable.heart ),
 
-    DateAdded( R.string.sort_date_added, R.drawable.time );
+    DateAdded( R.string.sort_date_added, R.drawable.time ),
+
+    UnmatchedSongs( R.string.unmatched, R.drawable.alert );
 
     override val titleId: Int
         get() {

composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/SwipeableContent.kt

@@ -176,10 +176,11 @@ fun SwipeableQueueItem(
     val onFavourite: () -> Unit = {
         mediaItemToggleLike(mediaItem)
         val message: String
-        if( likedAt != null ) {
-            val mTitle: String = mediaItem.mediaMetadata.title?.toString() ?: ""
-            val mArtist: String = mediaItem.mediaMetadata.artist?.toString() ?: ""
-
+        val mTitle: String = mediaItem.mediaMetadata.title?.toString() ?: ""
+        val mArtist: String = mediaItem.mediaMetadata.artist?.toString() ?: ""
+        if(likedAt == -1L) {
+            message = "\"$mTitle - $mArtist\" ${context.resources.getString(R.string.removed_from_disliked)}"
+        } else if( likedAt != null ) {
             message = "\"$mTitle - $mArtist\" ${context.resources.getString(R.string.removed_from_favorites)}"
         } else
             message = context.resources.getString(R.string.added_to_favorites)
@@ -251,10 +252,11 @@ fun SwipeablePlaylistItem(
     val onFavourite: () -> Unit = {
         mediaItemToggleLike(mediaItem)
         val message: String
-        if( likedAt != null ) {
-            val mTitle: String = mediaItem.mediaMetadata.title?.toString() ?: ""
-            val mArtist: String = mediaItem.mediaMetadata.artist?.toString() ?: ""
-
+        val mTitle: String = mediaItem.mediaMetadata.title?.toString() ?: ""
+        val mArtist: String = mediaItem.mediaMetadata.artist?.toString() ?: ""
+        if(likedAt == -1L) {
+            message = "\"$mTitle - $mArtist\" ${context.resources.getString(R.string.removed_from_disliked)}"
+        } else if ( likedAt != null ) {
             message = "\"$mTitle - $mArtist\" ${context.resources.getString(R.string.removed_from_favorites)}"
         } else
             message = context.resources.getString(R.string.added_to_favorites)

composeApp/src/androidMain/kotlin/it/fast4x/rimusic/ui/components/tab/ImportSongsFromCSV.kt

@@ -16,6 +16,7 @@ import it.fast4x.rimusic.ui.components.themed.SmartMessage
 import it.fast4x.rimusic.appContext
 import it.fast4x.rimusic.ui.components.tab.toolbar.Descriptive
 import it.fast4x.rimusic.ui.components.tab.toolbar.MenuIcon
+import it.fast4x.rimusic.utils.formatAsDuration
 
 class ImportSongsFromCSV private constructor(
     private val launcher: ManagedActivityResultLauncher<Array<String>, Uri?>
@@ -38,18 +39,19 @@ class ImportSongsFromCSV private constructor(
                                     Database.asyncTransaction {
                                         beforeTransaction( index, row )
                                         /**/
-                                        val mediaId = row["MediaId"]
-                                        val title = row["Title"]
+                                        val explicitPrefix = if (row["Explicit"] == "true") "e:" else ""
+                                        val pseudoMediaId = (row["Track Name"]+row["Artist Name(s)"]).filter { it.isLetterOrDigit() }
+                                        val title = row["Title"] ?: row["Track Name"] ?: return@asyncTransaction
+                                        val mediaId = row["MediaId"] ?: pseudoMediaId
+                                        val artistsText = row["Artists"] ?: row["Artist Name(s)"] ?: ""
+                                        val durationText = row["Duration"] ?: formatAsDuration(row["Track Duration (ms)"]?.toLong() ?: 0L)
 
-                                        if( mediaId == null || title == null)
-                                            return@asyncTransaction
-
-                                        val song = Song (
+                                        val song = Song(
                                             id = mediaId,
-                                            title = title,
-                                            artistsText = row["Artists"],
-                                            durationText = row["Duration"],
-                                            thumbnailUrl = row["ThumbnailUrl"],
+                                            title = explicitPrefix+title,
+                                            artistsText = artistsText,
+                                            durationText = durationText,
+                                            thumbnailUrl = row["ThumbnailUrl"] ?: "",
                                             totalPlayTimeMs = 1L
                                         )
                                         afterTransaction( index, song )