fix(serverHandler): treat dot symbol prior in filename sorting

Author: marjune163

src/serverHandler/sort.go

@@ -31,7 +31,7 @@ func (sInfos sortableFileInfos) Less(i, j int) bool {
 		return prevIsDir
 	}
 
-	return util.CompareNumInStr(sInfos.names[i], sInfos.names[j])
+	return util.CompareNumInFilename(sInfos.names[i], sInfos.names[j])
 }
 
 func (sInfos sortableFileInfos) Swap(i, j int) {

src/util/compareNumInStr.go renamed to src/util/compareNumInFilename.go

@@ -35,7 +35,7 @@ func extractPrefixDigits(input []byte) []byte {
 	return buf[:prefixLen]
 }
 
-func CompareNumInStr(prev, next []byte) bool {
+func CompareNumInFilename(prev, next []byte) bool {
 	if len(prev) == 0 {
 		return true
 	} else if len(next) == 0 {
@@ -64,13 +64,20 @@ func CompareNumInStr(prev, next []byte) bool {
 	}
 
 	if prevDigitsLen == 0 { // prevDigitsLen and nextDigitsLen is 0
-		return bytes.Compare(prev, next) < 0
+		switch {
+		case prev[0] == '.':
+			return true
+		case next[0] == '.':
+			return false
+		default:
+			return bytes.Compare(prev, next) < 0
+		}
 	}
 
 	compareResult := bytes.Compare(prevDigits, nextDigits)
 	if compareResult != 0 {
 		return compareResult < 0
 	} else {
-		return CompareNumInStr(prev[prevDigitsLen:], next[nextDigitsLen:])
+		return CompareNumInFilename(prev[prevDigitsLen:], next[nextDigitsLen:])
 	}
 }

src/util/compareNumInStr_test.go renamed to src/util/compareNumInFilename_test.go

@@ -2,42 +2,48 @@ package util
 
 import "testing"
 
-func TestCompareNumInStr(t *testing.T) {
+func TestCompareNumInFilename(t *testing.T) {
 	var prev, next string
 
 	prev = "2"
 	next = "3"
-	if CompareNumInStr([]byte(prev), []byte(next)) != true {
+	if !CompareNumInFilename([]byte(prev), []byte(next)) {
 		t.Error(prev, next)
 	}
 
 	prev = "2"
 	next = "20"
-	if CompareNumInStr([]byte(prev), []byte(next)) != true {
+	if !CompareNumInFilename([]byte(prev), []byte(next)) {
 		t.Error(prev, next)
 	}
 
 	prev = "1.1"
 	next = "1.10"
-	if CompareNumInStr([]byte(prev), []byte(next)) != true {
+	if !CompareNumInFilename([]byte(prev), []byte(next)) {
 		t.Error(prev, next)
 	}
 
 	prev = "1.2"
 	next = "1.10"
-	if CompareNumInStr([]byte(prev), []byte(next)) != true {
+	if !CompareNumInFilename([]byte(prev), []byte(next)) {
 		t.Error(prev, next)
 	}
 
 	prev = "1.3.2"
 	next = "1.3.10"
-	if CompareNumInStr([]byte(prev), []byte(next)) != true {
+	if !CompareNumInFilename([]byte(prev), []byte(next)) {
 		t.Error(prev, next)
 	}
 
 	prev = "name"
 	next = "name-suffix"
-	if CompareNumInStr([]byte(prev), []byte(next)) != true {
+	if !CompareNumInFilename([]byte(prev), []byte(next)) {
+		t.Error(prev, next)
+	}
+
+	prev = "name.txt"
+	next = "name-1.txt"
+	if !CompareNumInFilename([]byte(prev), []byte(next)) {
 		t.Error(prev, next)
 	}
 }

test/case/009.sort.bash

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+source "$root"/lib.bash
+
+"$ghfs" -l 3003 -r "$fs"/vhost1 -a :/hello-index.txt:"$fs"/vhost1/hello/index.txt &
+sleep 0.05 # wait server ready
+
+line1=$(curl_get_body http://127.0.0.1:3003/ | grep -n './file1.txt' | cut -d ':' -f1)
+line2=$(curl_get_body http://127.0.0.1:3003/ | grep -n './file1-1.txt' | cut -d ':' -f1)
+line3=$(curl_get_body http://127.0.0.1:3003/ | grep -n './file2.txt' | cut -d ':' -f1)
+line4=$(curl_get_body http://127.0.0.1:3003/ | grep -n './file10.txt' | cut -d ':' -f1)
+line5=$(curl_get_body http://127.0.0.1:3003/ | grep -n './hello-index.txt' | cut -d ':' -f1)
+
+[ -z "$line1" ] && fail 'line1 is empty'
+[ -z "$line2" ] && fail 'line2 is empty'
+[ -z "$line3" ] && fail 'line3 is empty'
+[ -z "$line4" ] && fail 'line4 is empty'
+[ -z "$line5" ] && fail 'line5 is empty'
+
+[ ! "$line1" -lt "$line2" ] && fail "line1 is not before line2"
+[ ! "$line2" -lt "$line3" ] && fail "line2 is not before line3"
+[ ! "$line3" -lt "$line4" ] && fail "line3 is not before line4"
+[ ! "$line4" -lt "$line5" ] && fail "line4 is not before line5"
+
+kill %1