feat(serverHandler): omit url parameter for default sort

Author: marjune163

src/serverHandler/pathContext.go

@@ -1,19 +1,20 @@
 package serverHandler
 
 type pathContext struct {
-	sort string
+	defaultSort string
+	sort        *string
 }
 
 func (ctx *pathContext) QueryString() string {
-	if len(ctx.sort) > 0 {
-		return "?sort=" + ctx.sort
+	if ctx.sort != nil && *(ctx.sort) != ctx.defaultSort {
+		return "?sort=" + *(ctx.sort)
 	} else {
 		return ""
 	}
 }
 
 func (ctx *pathContext) QueryStringOfSort(sort string) string {
 	copiedCtx := *ctx
-	copiedCtx.sort = sort
+	copiedCtx.sort = &sort
 	return copiedCtx.QueryString()
 }

src/serverHandler/pathContext_test.go

@@ -6,17 +6,39 @@ import (
 
 func TestPathContext(t *testing.T) {
 	var result string
+	var sort string
 
-	ctx := &pathContext{}
-	result = ctx.QueryString()
+	result = (&pathContext{}).QueryString()
 	if result != "" {
 		t.Error(result)
 	}
 
-	ctx.sort = "/n"
-	result = ctx.QueryString()
-	if result != "?sort=/n" {
+	result = (&pathContext{defaultSort: "/n"}).QueryString()
+	if result != "" {
+		t.Error(result)
+	}
+
+	sort = ""
+	result = (&pathContext{defaultSort: "/n", sort: &sort}).QueryString()
+	if result != "?sort=" {
+		t.Error(result)
+	}
+
+	sort = "/n"
+	result = (&pathContext{defaultSort: "/n", sort: &sort}).QueryString()
+	if result != "" {
+		t.Error(result)
+	}
+
+	sort = ""
+	result = (&pathContext{sort: &sort}).QueryString()
+	if result != "" {
 		t.Error(result)
 	}
 
+	sort = "/n"
+	result = (&pathContext{sort: &sort}).QueryString()
+	if result != "?sort=/n" {
+		t.Error(result)
+	}
 }

src/serverHandler/responseData.go

@@ -340,7 +340,10 @@ func (h *handler) getResponseData(r *http.Request) *responseData {
 
 	subItemPrefix := getSubItemPrefix(rawReqPath, tailSlash)
 
-	context := &pathContext{sort: rawSortBy}
+	context := &pathContext{
+		defaultSort: h.defaultSort,
+		sort:        rawSortBy,
+	}
 
 	canUpload := h.getCanUpload(item, rawReqPath, reqFsPath)
 	canMkdir := h.getCanMkdir(item, rawReqPath, reqFsPath)

src/serverHandler/sort.go

@@ -191,21 +191,23 @@ func sortSubItemOriginal(subInfos []os.FileInfo, compareDir fnCompareDir) {
 		return i < j
 	})
 }
-func sortSubItems(subInfos []os.FileInfo, rawQuery string, defaultSortBy string) (rawSortBy string, sortInfo SortState) {
+func sortSubItems(subInfos []os.FileInfo, rawQuery string, defaultSortBy string) (rawSortBy *string, sortInfo SortState) {
 	const sortPrefix = "sort="
 	var sortBy string
 
 	// extract sort string
 	iSortBy := strings.Index(rawQuery, sortPrefix)
 	if iSortBy < 0 {
 		sortBy = defaultSortBy
-	} else if len(rawQuery) > iSortBy+len(sortPrefix) {
-		sortBy = rawQuery[iSortBy+len(sortPrefix):]
-		iAmp := strings.IndexByte(sortBy, '&')
-		if iAmp >= 0 {
-			sortBy = sortBy[:iAmp]
+	} else {
+		if len(rawQuery) > iSortBy+len(sortPrefix) {
+			sortBy = rawQuery[iSortBy+len(sortPrefix):]
+			iAmp := strings.IndexByte(sortBy, '&')
+			if iAmp >= 0 {
+				sortBy = sortBy[:iAmp]
+			}
 		}
-		rawSortBy = sortBy
+		rawSortBy = &sortBy
 	}
 
 	if len(sortBy) == 0 {