Skip to content

🎧 Your Personal Streaming Service

Use order/sort album/artist when sorting tracks in playlists. Fixes #2819

Deluan6d253225de08
diff --git a/persistence/playlist_track_repository.go b/persistence/playlist_track_repository.go
index 484e6fd0e..24a73f63e 100644
--- a/persistence/playlist_track_repository.go
+++ b/persistence/playlist_track_repository.go
@@ -5,6 +5,7 @@ import (
. "github.com/Masterminds/squirrel"
"github.com/deluan/rest"
+ "github.com/navidrome/navidrome/conf"
"github.com/navidrome/navidrome/log"
"github.com/navidrome/navidrome/model"
"github.com/navidrome/navidrome/utils/slice"
@@ -26,8 +27,15 @@ func (r *playlistRepository) Tracks(playlistId string, refreshSmartPlaylist bool
p.db = r.db
p.tableName = "playlist_tracks"
p.sortMappings = map[string]string{
- "id": "playlist_tracks.id",
+ "id": "playlist_tracks.id",
+ "artist": "order_artist_name asc",
+ "album": "order_album_name asc, order_album_artist_name asc",
}
+ if conf.Server.PreferSortTags {
+ p.sortMappings["artist"] = "COALESCE(NULLIF(sort_artist_name,''),order_artist_name) asc"
+ p.sortMappings["album"] = "COALESCE(NULLIF(sort_album_name,''),order_album_name)"
+ }
+
pls, err := r.Get(playlistId)
if err != nil {
log.Error(r.ctx, "Error getting playlist's tracks - THIS SHOULD NOT HAPPEN!", "playlistId", playlistId, err)