owen/supersonic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add shuffle button to album and playlist pages

Browse Source
This commit is contained in:
Drew Weymouth
2023-02-15 19:46:08 -08:00
parent 76828ecf5e
commit aa2204b88f
32 changed files with 123 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/playbackmanager.go
+14 -10
View File
@@ -108,42 +108,46 @@ func (p *PlaybackManager) OnPlayTimeUpdate(cb func(float64, float64)) {
}
// Loads the specified album into the play queue.
func (p *PlaybackManager) LoadAlbum(albumID string, appendToQueue bool) error {
func (p *PlaybackManager) LoadAlbum(albumID string, appendToQueue bool, shuffle bool) error {
album, err := p.sm.Server.GetAlbum(albumID)
if err != nil {
return err
}
return p.LoadTracks(album.Song, appendToQueue)
return p.LoadTracks(album.Song, appendToQueue, shuffle)
}
// Loads the specified playlist into the play queue.
func (p *PlaybackManager) LoadPlaylist(playlistID string, appendToQueue bool) error {
func (p *PlaybackManager) LoadPlaylist(playlistID string, appendToQueue bool, shuffle bool) error {
playlist, err := p.sm.Server.GetPlaylist(playlistID)
if err != nil {
return err
}
return p.LoadTracks(playlist.Entry, appendToQueue)
return p.LoadTracks(playlist.Entry, appendToQueue, shuffle)
}
func (p *PlaybackManager) LoadTracks(tracks []*subsonic.Child, appendToQueue bool) error {
func (p *PlaybackManager) LoadTracks(tracks []*subsonic.Child, appendToQueue, shuffle bool) error {
if !appendToQueue {
p.player.Stop()
p.nowPlayingIdx = 0
p.playQueue = nil
}
for _, song := range tracks {
url, err := p.sm.Server.GetStreamURL(song.ID, map[string]string{})
nums := util.Range(len(tracks))
if shuffle {
util.ShuffleSlice(nums)
}
for _, i := range nums {
url, err := p.sm.Server.GetStreamURL(tracks[i].ID, map[string]string{})
if err != nil {
return err
}
p.player.AppendFile(url.String())
p.playQueue = append(p.playQueue, song)
p.playQueue = append(p.playQueue, tracks[i])
}
return nil
}
func (p *PlaybackManager) PlayAlbum(albumID string, firstTrack int) error {
if err := p.LoadAlbum(albumID, false); err != nil {
if err := p.LoadAlbum(albumID, false, false); err != nil {
return err
}
if firstTrack <= 0 {
@@ -153,7 +157,7 @@ func (p *PlaybackManager) PlayAlbum(albumID string, firstTrack int) error {
}
func (p *PlaybackManager) PlayPlaylist(playlistID string, firstTrack int) error {
if err := p.LoadPlaylist(playlistID, false); err != nil {
if err := p.LoadPlaylist(playlistID, false, false); err != nil {
return err
}
if firstTrack <= 0 {