beenull/ViMusic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify queries to move song in playlist

Browse source
This commit is contained in:
vfsfitvnm 2022-09-15 18:56:34 +02:00
parent 19b19fe958
commit e13d083a8c
3 changed files with 14 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/kotlin/it/vfsfitvnm/vimusic/Database.kt
View file

@ -197,14 +197,16 @@ interface Database {
@RewriteQueriesToDropUnusedColumns @RewriteQueriesToDropUnusedColumns
fun songsWithContentLength(): Flow<List<DetailedSongWithContentLength>> fun songsWithContentLength(): Flow<List<DetailedSongWithContentLength>>
@Query("UPDATE SongPlaylistMap SET position = position - 1 WHERE playlistId = :playlistId AND position >= :fromPosition") @Query("""
fun decrementSongPositions(playlistId: Long, fromPosition: Int) UPDATE SongPlaylistMap SET position =
CASE
@Query("UPDATE SongPlaylistMap SET position = position - 1 WHERE playlistId = :playlistId AND position >= :fromPosition AND position <= :toPosition") WHEN position < :fromPosition THEN position + 1
fun decrementSongPositions(playlistId: Long, fromPosition: Int, toPosition: Int) WHEN position > :fromPosition THEN position - 1
ELSE :toPosition
@Query("UPDATE SongPlaylistMap SET position = position + 1 WHERE playlistId = :playlistId AND position >= :fromPosition AND position <= :toPosition") END
fun incrementSongPositions(playlistId: Long, fromPosition: Int, toPosition: Int) WHERE playlistId = :playlistId AND position BETWEEN MIN(:fromPosition,:toPosition) and MAX(:fromPosition,:toPosition)
""")
fun move(playlistId: Long, fromPosition: Int, toPosition: Int)
@Query("DELETE FROM SongPlaylistMap WHERE playlistId = :id") @Query("DELETE FROM SongPlaylistMap WHERE playlistId = :id")
fun clearPlaylist(id: Long) fun clearPlaylist(id: Long)

13
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt
View file

@ -132,17 +132,8 @@ fun InPlaylistMediaItemMenu(
onDismiss = onDismiss, onDismiss = onDismiss,
onRemoveFromPlaylist = { onRemoveFromPlaylist = {
transaction { transaction {
Database.delete( Database.move(playlistId, positionInPlaylist, Int.MAX_VALUE)
SongPlaylistMap( Database.delete(SongPlaylistMap(song.id, playlistId, Int.MAX_VALUE))
songId = song.id,
playlistId = playlistId,
position = positionInPlaylist
)
)
Database.decrementSongPositions(
playlistId = playlistId,
fromPosition = positionInPlaylist + 1
)
} }
}, },
modifier = modifier modifier = modifier

24
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/LocalPlaylistScreen.kt
View file

@ -92,28 +92,8 @@ fun LocalPlaylistScreen(playlistId: Long) {
lazyListState = lazyListState, lazyListState = lazyListState,
key = playlistWithSongs.songs, key = playlistWithSongs.songs,
onDragEnd = { fromIndex, toIndex -> onDragEnd = { fromIndex, toIndex ->
transaction { query {
if (fromIndex > toIndex) { Database.move(playlistWithSongs.playlist.id, fromIndex, toIndex)
Database.incrementSongPositions(
playlistId = playlistWithSongs.playlist.id,
fromPosition = toIndex,
toPosition = fromIndex - 1
)
} else if (fromIndex < toIndex) {
Database.decrementSongPositions(
playlistId = playlistWithSongs.playlist.id,
fromPosition = fromIndex + 1,
toPosition = toIndex
)
}
Database.update(
SongPlaylistMap(
songId = playlistWithSongs.songs[fromIndex].id,
playlistId = playlistWithSongs.playlist.id,
position = toIndex
)
)
} }
}, },
extraItemCount = 1 extraItemCount = 1