refactor(serverHandler/sort): adjust name sort struct

Author: marjune163

src/serverHandler/sort.go

@@ -33,77 +33,87 @@ var cmpDirMixed fnCompareDir = func(prev, next os.FileInfo) (less, ok bool) {
 	return true, false
 }
 
-// sort name asc
+// infosNames
 
-type sortNameAscInfos struct {
+type infosNames struct {
 	infos      []os.FileInfo
 	names      [][]byte
 	compareDir fnCompareDir
 }
 
-func (sInfos sortNameAscInfos) Len() int {
-	return len(sInfos.names)
+func (xInfos infosNames) Len() int {
+	return len(xInfos.names)
 }
 
-func (sInfos sortNameAscInfos) Less(i, j int) bool {
-	less, ok := sInfos.compareDir(sInfos.infos[i], sInfos.infos[j])
-	if ok {
-		return less
-	}
-
-	less, ok = util.CompareNumInFilename(sInfos.names[i], sInfos.names[j])
-	if ok {
-		return less
-	}
+func (xInfos infosNames) Swap(i, j int) {
+	xInfos.infos[i], xInfos.infos[j] = xInfos.infos[j], xInfos.infos[i]
+	xInfos.names[i], xInfos.names[j] = xInfos.names[j], xInfos.names[i]
+}
 
-	return i < j
+func (xInfos infosNames) LessDir(i, j int) (less, ok bool) {
+	return xInfos.compareDir(xInfos.infos[i], xInfos.infos[j])
 }
 
-func (sInfos sortNameAscInfos) 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 (xInfos infosNames) LessFilename(i, j int) (less, ok bool) {
+	return util.CompareNumInFilename(xInfos.names[i], xInfos.names[j])
 }
 
-func newSortNameAscInfos(infos []os.FileInfo, compareDir fnCompareDir) sortNameAscInfos {
+func newInfosNames(infos []os.FileInfo, compareDir fnCompareDir) infosNames {
 	names := make([][]byte, len(infos))
 	for i := range infos {
 		names[i] = []byte(infos[i].Name())
 	}
 
-	return sortNameAscInfos{infos, names, compareDir}
+	return infosNames{infos, names, compareDir}
+}
+
+// sort name asc
+
+type infosNamesAsc struct {
+	infosNames
+}
+
+func (xInfos infosNamesAsc) Less(i, j int) bool {
+	less, ok := xInfos.LessDir(i, j)
+	if ok {
+		return less
+	}
+
+	less, ok = xInfos.LessFilename(i, j)
+	if ok {
+		return less
+	}
+
+	return i < j
 }
 
 func sortInfoNamesAsc(infos []os.FileInfo, compareDir fnCompareDir) {
-	nameCachedInfos := newSortNameAscInfos(infos, compareDir)
+	nameCachedInfos := infosNamesAsc{newInfosNames(infos, compareDir)}
 	sort.Sort(nameCachedInfos)
 }
 
 // sort name desc
 
-type sortNameDescInfos struct {
-	sortNameAscInfos
+type infosNamesDesc struct {
+	infosNames
 }
 
-func (sInfos sortNameDescInfos) Less(i, j int) bool {
-	less, ok := sInfos.compareDir(sInfos.infos[i], sInfos.infos[j])
+func (xInfos infosNamesDesc) Less(i, j int) bool {
+	less, ok := xInfos.LessDir(i, j)
 	if ok {
 		return less
 	}
 
-	less, ok = util.CompareNumInFilename(sInfos.names[j], sInfos.names[i])
+	less, ok = xInfos.LessFilename(j, i)
 	if ok {
 		return less
 	}
 
 	return j < i
 }
 
-func newSortNameDescInfos(infos []os.FileInfo, compareDir fnCompareDir) sortNameDescInfos {
-	return sortNameDescInfos{newSortNameAscInfos(infos, compareDir)}
-}
-
 func sortInfoNamesDesc(infos []os.FileInfo, compareDir fnCompareDir) {
-	nameCachedInfos := newSortNameDescInfos(infos, compareDir)
+	nameCachedInfos := infosNamesDesc{newInfosNames(infos, compareDir)}
 	sort.Sort(nameCachedInfos)
 }