From 572a2e511dedbd9c898e90071b66af51ed1f07d5 Mon Sep 17 00:00:00 2001
From: Drew Weymouth <dweymouth@gmail.com>
Date: Wed, 24 May 2023 09:11:50 -0700
Subject: [PATCH] reorder playlist tracks based on original sort and switch to
 unsorted view

---
 ui/browsing/playlistpage.go | 19 +++++++++++++------
 ui/widgets/tracklist.go     |  8 ++++++--
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ui/browsing/playlistpage.go b/ui/browsing/playlistpage.go
index b18dca8..c273173 100644
--- a/ui/browsing/playlistpage.go
+++ b/ui/browsing/playlistpage.go
@@ -158,16 +158,23 @@ 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.GetTracks(), idxs, op)
-	ids := make([]string, len(newTracks))
-	for i, tr := range newTracks {
-		ids[i] = tr.ID
+	// Since the tracklist view may be sorted in a different order than the
+	// actual running order, we need to get the IDs of the selected tracks
+	// from the tracklist and convert them to indices in the *original* run order
+	ids := a.tracklist.SelectedTrackIDs()
+	idxs := make([]int, 0, len(ids))
+	for i, tr := range a.tracks {
+		if sharedutil.SliceContains(ids, tr.ID) {
+			idxs = append(idxs, i)
+		}
 	}
+	newTracks := sharedutil.ReorderTracks(a.tracks, idxs, op)
+	ids = sharedutil.TracksToIDs(newTracks)
 	if err := a.sm.Server.ReplacePlaylistTracks(a.playlistID, ids); err != nil {
 		log.Printf("error updating playlist: %s", err.Error())
 	} else {
+		// force-switch back to unsorted view to show new track order
+		a.tracklist.SetSorting(widgets.TracklistSort{})
 		a.tracklist.SetTracks(newTracks)
 		a.tracklist.UnselectAll()
 		a.tracklist.Refresh()
diff --git a/ui/widgets/tracklist.go b/ui/widgets/tracklist.go
index cda38a8..866386c 100644
--- a/ui/widgets/tracklist.go
+++ b/ui/widgets/tracklist.go
@@ -214,6 +214,10 @@ func (t *Tracklist) Sorting() TracklistSort {
 
 func (t *Tracklist) SetSorting(sorting TracklistSort) {
 	if sorting.ColumnName == "" {
+		// nil case - reset current sort
+		if sharedutil.SliceContains(columns, t.sorting.ColumnName) {
+			t.hdr.SetSorting(ListHeaderSort{ColNumber: ColNumber(t.sorting.ColumnName), Type: SortNone})
+		}
 		return
 	}
 	// actual sorting will be handled in callback from header
@@ -425,7 +429,7 @@ func (t *Tracklist) onShowContextMenu(e *fyne.PointEvent, trackIdx int) {
 		t.ctxMenu.Items = append(t.ctxMenu.Items,
 			fyne.NewMenuItem("Add to playlist...", func() {
 				if t.OnAddToPlaylist != nil {
-					t.OnAddToPlaylist(t.selectedTrackIDs())
+					t.OnAddToPlaylist(t.SelectedTrackIDs())
 				}
 			}))
 		t.ctxMenu.Items = append(t.ctxMenu.Items, fyne.NewMenuItemSeparator())
@@ -513,7 +517,7 @@ func (t *Tracklist) selectedTracks() []*mediaprovider.Track {
 	return tracks
 }
 
-func (t *Tracklist) selectedTrackIDs() []string {
+func (t *Tracklist) SelectedTrackIDs() []string {
 	sel := t.selectionMgr.GetSelection()
 	tracks := make([]string, 0, len(sel))
 	t.tracksMutex.RLock()