add tracklist sorting logic

ui/browsing/albumpage.go

@@ -26,6 +26,7 @@ type AlbumPage struct {
 	albumPageState
 
 	header       *AlbumPageHeader
+	tracks       []*mediaprovider.Track
 	tracklist    *widgets.Tracklist
 	nowPlayingID string
 	container    *fyne.Container
@@ -119,7 +120,8 @@ func (a *AlbumPage) load() {
 	}
 	a.header.Update(album, a.im)
 	a.tracklist.ShowDiscNumber = album.Tracks[0].DiscNumber != album.Tracks[len(album.Tracks)-1].DiscNumber
-	a.tracklist.Tracks = album.Tracks
+	a.tracks = album.Tracks
+	a.tracklist.SetTracks(album.Tracks)
 	a.tracklist.SetNowPlaying(a.nowPlayingID)
 }
 
@@ -169,7 +171,7 @@ func NewAlbumPageHeader(page *AlbumPage) *AlbumPageHeader {
 		go page.pm.PlayAlbum(page.albumID, 0, false)
 	})
 	shuffleBtn := widget.NewButtonWithIcon(" Shuffle", myTheme.ShuffleIcon, func() {
-		page.pm.LoadTracks(page.tracklist.Tracks, false, true)
+		page.pm.LoadTracks(page.tracklist.GetTracks(), false, true)
 		page.pm.PlayFromBeginning()
 	})
 	var pop *widget.PopUpMenu
@@ -178,11 +180,11 @@ func NewAlbumPageHeader(page *AlbumPage) *AlbumPageHeader {
 		if pop == nil {
 			menu := fyne.NewMenu("",
 				fyne.NewMenuItem("Add to queue", func() {
-					a.page.pm.LoadAlbum(a.albumID, true /*append*/, false /*shuffle*/)
+					go a.page.pm.LoadAlbum(a.albumID, true /*append*/, false /*shuffle*/)
 				}),
 				fyne.NewMenuItem("Add to playlist...", func() {
 					a.page.contr.DoAddTracksToPlaylistWorkflow(
-						sharedutil.TracksToIDs(a.page.tracklist.Tracks))
+						sharedutil.TracksToIDs(a.page.tracks))
 				}))
 			pop = widget.NewPopUpMenu(menu, fyne.CurrentApp().Driver().CanvasForObject(a))
 		}

ui/browsing/favoritespage.go

@@ -154,7 +154,7 @@ func (a *FavoritesPage) Reload() {
 			if a.tracklistCtr != nil {
 				// refresh favorite songs view
 				tr := a.tracklistCtr.Objects[0].(*widgets.Tracklist)
-				tr.Tracks = starred.Tracks
+				tr.SetTracks(starred.Tracks)
 				if a.toggleBtns.ActivatedButtonIndex() == 2 {
 					// favorite songs view is visible
 					tr.Refresh()

ui/browsing/nowplayingpage.go

@@ -107,7 +107,7 @@ func (a *NowPlayingPage) onRemoveSelectedFromQueue() {
 // does not make calls to server - can safely be run in UI callbacks
 func (a *NowPlayingPage) load(highlightedTrackID string) {
 	queue := a.pm.GetPlayQueue()
-	a.tracklist.Tracks = queue
+	a.tracklist.SetTracks(queue)
 	a.tracklist.SetNowPlaying(a.nowPlayingID)
 	if highlightedTrackID != "" {
 		a.tracklist.SelectAndScrollToTrack(highlightedTrackID)

ui/browsing/playlistpage.go

@@ -27,6 +27,7 @@ type PlaylistPage struct {
 
 	header       *PlaylistPageHeader
 	tracklist    *widgets.Tracklist
+	tracks       []*mediaprovider.Track
 	nowPlayingID string
 	container    *fyne.Container
 }
@@ -118,7 +119,8 @@ func (a *PlaylistPage) load() {
 		log.Printf("Failed to get playlist: %s", err.Error())
 		return
 	}
-	a.tracklist.Tracks = playlist.Tracks
+	a.tracks = playlist.Tracks
+	a.tracklist.SetTracks(playlist.Tracks)
 	a.tracklist.SetNowPlaying(a.nowPlayingID)
 	a.tracklist.Refresh()
 	a.header.Update(playlist)
@@ -141,8 +143,9 @@ func (a *PlaylistPage) onMoveSelectedToBottom() {
 }
 
 func (a *PlaylistPage) doSetNewTrackOrder(op sharedutil.TrackReorderOp) {
+	// TODO: revisit this for how to deal with sort order
 	idxs := a.tracklist.SelectedTrackIndexes()
-	newTracks := sharedutil.ReorderTracks(a.tracklist.Tracks, idxs, op)
+	newTracks := sharedutil.ReorderTracks(a.tracklist.GetTracks(), idxs, op)
 	ids := make([]string, len(newTracks))
 	for i, tr := range newTracks {
 		ids[i] = tr.ID
@@ -150,7 +153,7 @@ func (a *PlaylistPage) doSetNewTrackOrder(op sharedutil.TrackReorderOp) {
 	if err := a.sm.Server.ReplacePlaylistTracks(a.playlistID, ids); err != nil {
 		log.Printf("error updating playlist: %s", err.Error())
 	} else {
-		a.tracklist.Tracks = newTracks
+		a.tracklist.SetTracks(newTracks)
 		a.tracklist.UnselectAll()
 		a.tracklist.Refresh()
 	}
@@ -200,12 +203,12 @@ func NewPlaylistPageHeader(page *PlaylistPage) *PlaylistPageHeader {
 	})
 	a.editButton.Hidden = true
 	playButton := widget.NewButtonWithIcon("Play", theme.MediaPlayIcon(), func() {
-		page.pm.LoadTracks(page.tracklist.Tracks, false, false)
+		page.pm.LoadTracks(page.tracks, false, false)
 		page.pm.PlayFromBeginning()
 	})
 	// TODO: find way to pad shuffle svg rather than using a space in the label string
 	shuffleBtn := widget.NewButtonWithIcon(" Shuffle", myTheme.ShuffleIcon, func() {
-		page.pm.LoadTracks(page.tracklist.Tracks, false /*append*/, true /*shuffle*/)
+		page.pm.LoadTracks(page.tracks, false /*append*/, true /*shuffle*/)
 		page.pm.PlayFromBeginning()
 	})
 	var pop *widget.PopUpMenu
@@ -218,7 +221,7 @@ func NewPlaylistPageHeader(page *PlaylistPage) *PlaylistPageHeader {
 				}),
 				fyne.NewMenuItem("Add to playlist...", func() {
 					a.page.contr.DoAddTracksToPlaylistWorkflow(
-						sharedutil.TracksToIDs(a.page.tracklist.Tracks))
+						sharedutil.TracksToIDs(a.page.tracks))
 				}))
 			pop = widget.NewPopUpMenu(menu, fyne.CurrentApp().Driver().CanvasForObject(a))
 		}