Merge pull request #57 from xxxserxxx/ticket_11_sort_by_disknumber

Adds ticket #11, sort by dis[c]number

page_browser.go

@@ -258,6 +258,8 @@ func (b *BrowserPage) handleAddArtistToQueue() {
 		return
 	}
 
+	sort.Sort(b.currentDirectory.Entities)
+
 	for _, entity := range b.currentDirectory.Entities {
 		if entity.IsDirectory {
 			b.addDirectoryToQueue(&entity)

subsonic/api.go

@@ -10,6 +10,7 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"sort"
 	"strconv"
 	"strings"
 
@@ -207,11 +208,19 @@ func (s SubsonicEntities) Less(i, j int) bool {
 		}
 		return true
 	}
-	// If the tracks are the same, sort alphabetically
-	if s[i].Track == s[j].Track {
-		return s[i].Title < s[j].Title
+	// Disk and track numbers are only relevant within the same parent
+	if s[i].Parent == s[j].Parent {
+		// sort first by DiskNumber
+		if s[i].DiscNumber == s[j].DiscNumber {
+			// Tracks on the same disk are sorted by track
+			return s[i].Track < s[j].Track
+		}
+		return s[i].DiscNumber < s[j].DiscNumber
 	}
-	return s[i].Track < s[j].Track
+	// If we get here, the songs are either from different albums, or else
+	// they're on the same disk
+
+	return s[i].Title < s[j].Title
 }
 
 type SubsonicIndexes struct {
@@ -300,6 +309,8 @@ func (connection *SubsonicConnection) GetArtist(id string) (*SubsonicResponse, e
 		connection.directoryCache[id] = *resp
 	}
 
+	sort.Sort(resp.Directory.Entities)
+
 	return resp, nil
 }
 
@@ -324,6 +335,8 @@ func (connection *SubsonicConnection) GetAlbum(id string) (*SubsonicResponse, er
 		connection.directoryCache[id] = *resp
 	}
 
+	sort.Sort(resp.Directory.Entities)
+
 	return resp, nil
 }
 
@@ -345,6 +358,8 @@ func (connection *SubsonicConnection) GetMusicDirectory(id string) (*SubsonicRes
 		connection.directoryCache[id] = *resp
 	}
 
+	sort.Sort(resp.Directory.Entities)
+
 	return resp, nil
 }