add discnumber

server/handler/construct_sub_by_folder.go

@@ -41,6 +41,7 @@ func newTCTrackByFolder(t *model.Track, parent *model.Album) *subsonic.TrackChil
 		Artist:      t.TagTrackArtist,
 		Title:       t.TagTitle,
 		TrackNumber: t.TagTrackNumber,
+		DiscNumber:  t.TagDiscNumber,
 		Path: path.Join(
 			parent.LeftPath,
 			parent.RightPath,

server/handler/construct_sub_by_tags.go

@@ -34,6 +34,7 @@ func newTrackByTags(t *model.Track, album *model.Album) *subsonic.TrackChild {
 		Title:       t.TagTitle,
 		Artist:      t.TagTrackArtist,
 		TrackNumber: t.TagTrackNumber,
+		DiscNumber:  t.TagDiscNumber,
 		Path: path.Join(
 			album.LeftPath,
 			album.RightPath,

server/handler/handler_sub_by_tags.go

@@ -68,7 +68,7 @@ func (c *Controller) GetAlbum(w http.ResponseWriter, r *http.Request) {
 	err = c.DB.
 		Preload("TagArtist").
 		Preload("Tracks", func(db *gorm.DB) *gorm.DB {
-			return db.Order("tracks.tag_track_number")
+			return db.Order("tracks.tag_disc_number, tracks.tag_track_number")
 		}).
 		First(album, id).
 		Error

server/subsonic/subsonic.go

@@ -102,6 +102,7 @@ type TrackChild struct {
 	Suffix      string    `xml:"suffix,attr,omitempty"      json:"suffix,omitempty"`
 	Title       string    `xml:"title,attr,omitempty"       json:"title,omitempty"`
 	TrackNumber int       `xml:"track,attr,omitempty"       json:"track,omitempty"`
+	DiscNumber  int       `xml:"discNumber,attr,omitempty"  json:"discNumber,omitempty"`
 	Type        string    `xml:"type,attr,omitempty"        json:"type,omitempty"`
 }