fix(serverHandler): make sort correctly

`names` array items are not swaped before, which makes name comparison
works incorrectly.

Author: marjune163

src/serverHandler/responseData.go

@@ -7,7 +7,6 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"sort"
 	"strings"
 )
 
@@ -201,30 +200,6 @@ func getItemName(info os.FileInfo, r *http.Request) (itemName string) {
 	return
 }
 
-func sortSubItems(subInfos []os.FileInfo) {
-	names := make([][]byte, len(subInfos))
-	for i := range subInfos {
-		names[i] = []byte(subInfos[i].Name())
-	}
-
-	sort.Slice(
-		subInfos,
-		func(prevIndex, nextIndex int) bool {
-			prevInfo := subInfos[prevIndex]
-			nextInfo := subInfos[nextIndex]
-
-			prevIsDir := prevInfo.IsDir()
-			nextIsDir := nextInfo.IsDir()
-
-			if prevIsDir != nextIsDir {
-				return prevIsDir
-			}
-
-			return util.CompareNumInStr(names[prevIndex], names[nextIndex])
-		},
-	)
-}
-
 func getStatusByErr(err error) int {
 	switch {
 	case os.IsPermission(err):

src/serverHandler/sort.go

@@ -0,0 +1,45 @@
+package serverHandler
+
+import (
+	"../util"
+	"os"
+	"sort"
+)
+
+type sortableFileInfos struct {
+	infos []os.FileInfo
+	names [][]byte
+}
+
+func newSortableFileInfos(infos []os.FileInfo) sortableFileInfos {
+	names := make([][]byte, len(infos))
+	for i := range infos {
+		names[i] = []byte(infos[i].Name())
+	}
+
+	return sortableFileInfos{infos, names}
+}
+
+func (sInfos sortableFileInfos) Len() int {
+	return len(sInfos.names)
+}
+
+func (sInfos sortableFileInfos) Less(i, j int) bool {
+	prevIsDir := sInfos.infos[i].IsDir()
+	nextIsDir := sInfos.infos[j].IsDir()
+	if prevIsDir != nextIsDir {
+		return prevIsDir
+	}
+
+	return util.CompareNumInStr(sInfos.names[i], sInfos.names[j])
+}
+
+func (sInfos sortableFileInfos) Swap(i, j int) {
+	sInfos.infos[i], sInfos.infos[j] = sInfos.infos[j], sInfos.infos[i]
+	sInfos.names[i], sInfos.names[j] = sInfos.names[j], sInfos.names[i]
+}
+
+func sortSubItems(subInfos []os.FileInfo) {
+	sortSubInfos := newSortableFileInfos(subInfos)
+	sort.Sort(sortSubInfos)
+}

src/util/compareNumInStr_test.go

@@ -34,6 +34,12 @@ func TestCompareNumInStr(t *testing.T) {
 	if CompareNumInStr([]byte(prev), []byte(next)) != true {
 		t.Error(prev, next)
 	}
+
+	prev = "name"
+	next = "name-suffix"
+	if CompareNumInStr([]byte(prev), []byte(next)) != true {
+		t.Error(prev, next)
+	}
 }
 
 func TestExtractPrefixDigits(t *testing.T) {