From 6eb1041ad828f62640bd751968ea3cc8c29d1010 Mon Sep 17 00:00:00 2001 From: sentriz Date: Mon, 27 May 2019 15:16:17 +0100 Subject: [PATCH] add some sorting --- server/handler/handler_sub_by_folder.go | 2 +- server/handler/handler_sub_by_tags.go | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/handler/handler_sub_by_folder.go b/server/handler/handler_sub_by_folder.go index c0c32cb..a89d3db 100644 --- a/server/handler/handler_sub_by_folder.go +++ b/server/handler/handler_sub_by_folder.go @@ -71,7 +71,7 @@ func (c *Controller) GetMusicDirectory(w http.ResponseWriter, r *http.Request) { c.DB. Where("folder_id = ?", id). Preload("Album"). - Order("track_number"). + Order("title"). Find(&tracks) for _, track := range tracks { if getStrParam(r, "c") == "Jamstash" { diff --git a/server/handler/handler_sub_by_tags.go b/server/handler/handler_sub_by_tags.go index 8a5599e..c4fcba9 100644 --- a/server/handler/handler_sub_by_tags.go +++ b/server/handler/handler_sub_by_tags.go @@ -75,7 +75,9 @@ func (c *Controller) GetAlbum(w http.ResponseWriter, r *http.Request) { var album model.Album c.DB. Preload("AlbumArtist"). - Preload("Tracks"). + Preload("Tracks", func(db *gorm.DB) *gorm.DB { + return db.Order("tracks.track_number") + }). First(&album, id) tracksObj := []*subsonic.Track{} for _, track := range album.Tracks {