Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes an issue where song sort order is 0 when adding to playlist #119

Merged
merged 2 commits into from
Mar 11, 2023
Merged

Fixes an issue where song sort order is 0 when adding to playlist #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cab2de9
Fixes an issue where song sort order is 0 when adding to playlist
timusus Mar 10, 2023
f86afd9
Merge branch 'main' into fix/playlist-sort-order
timusus Mar 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...ain/java/com/simplecityapps/localmediaprovider/local/data/room/entity/PlaylistSongJoin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@ import androidx.room.PrimaryKey
data class PlaylistSongJoin(
val playlistId: Long,
val songId: Long,
val sortOrder: Long
) {
@PrimaryKey(autoGenerate = true)
var id: Long = 0

var sortOrder: Long = id
}
22 changes: 16 additions & 6 deletions ...in/java/com/simplecityapps/localmediaprovider/local/repository/LocalPlaylistRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,27 @@ class LocalPlaylistRepository(
externalId = externalId
)
)
playlistSongJoinDao.insert(songs.orEmpty().map { song -> PlaylistSongJoin(playlistId, song.id) })
playlistSongJoinDao.insert(
songs.orEmpty().mapIndexed { i, song ->
PlaylistSongJoin(
playlistId = playlistId,
songId = song.id,
sortOrder = i.toLong()
)
}
)
val playlist = playlistDataDao.getPlaylist(playlistId)
Timber.v("Created playlist: ${playlist.name} with ${playlist.songCount} songs}")
return playlist
}

override suspend fun addToPlaylist(playlist: Playlist, songs: List<Song>) {
return playlistSongJoinDao.insert(
songs.map { song ->
songs.mapIndexed { i, song ->
PlaylistSongJoin(
playlistId = playlist.id,
songId = song.id
songId = song.id,
sortOrder = (playlist.songCount + i).toLong()
)
}
)
Expand Down Expand Up @@ -151,10 +160,11 @@ class LocalPlaylistRepository(
override suspend fun updatePlaylistSongsSortOder(playlist: Playlist, playlistSongs: List<PlaylistSong>) {
playlistSongJoinDao.updateSortOrder(
playlistSongs.map { playlistSong ->
PlaylistSongJoin(playlist.id, playlistSong.song.id).apply {
id = playlistSong.id
PlaylistSongJoin(
playlistId = playlist.id,
songId = playlistSong.song.id,
sortOrder = playlistSong.sortOrder
}
)
}
)
}
Expand Down