fix sort for dir, tracks

Author: mikuta0407

server/ctrlsubsonic/handlers_by_folder.go

@@ -3,6 +3,7 @@ package ctrlsubsonic
 import (
 	"fmt"
 	"net/http"
+	"sort"
 	"strings"
 
 	"github.com/jinzhu/gorm"
@@ -82,9 +83,13 @@ func (c *Controller) ServeGetMusicDirectory(r *http.Request) *spec.Response {
 		Preload("AlbumRating", "user_id=?", user.ID).
 		Order("albums.right_path COLLATE NOCASE").
 		Find(&childFolders)
+	// sort by TagYear
+	sort.Slice(childFolders, func(i, j int) bool { return childFolders[i].TagYear < childFolders[j].TagYear })
+
 	for _, ch := range childFolders {
 		childrenObj = append(childrenObj, spec.NewTCAlbumByFolder(ch))
 	}
+
 	// start looking for child childTracks in the current dir
 	var childTracks []*db.Track
 	c.dbc.
@@ -97,6 +102,9 @@ func (c *Controller) ServeGetMusicDirectory(r *http.Request) *spec.Response {
 		Order("filename").
 		Find(&childTracks)
 
+	// sort by tracknumber for if file name is 1, 2, ... 10, 11...
+	sort.Slice(childTracks, func(i, j int) bool { return childTracks[i].TagTrackNumber < childTracks[j].TagTrackNumber })
+
 	transcodeMeta := streamGetTranscodeMeta(c.dbc, user.ID, params.GetOr("c", ""))
 
 	for _, ch := range childTracks {

server/ctrlsubsonic/spec/construct_by_folder.go

@@ -40,6 +40,7 @@ func NewTCAlbumByFolder(f *db.Album) *TrackChild {
 		ParentID:      f.ParentSID(),
 		CreatedAt:     f.CreatedAt,
 		AverageRating: formatRating(f.AverageRating),
+		Year:          f.TagYear,
 	}
 	if f.AlbumStar != nil {
 		trCh.Starred = &f.AlbumStar.StarDate