refactor(serverHandler): simplify sort query string logic

No longer distinguish sorting not specified or specified as empty
string.

Author: marjune163

src/serverHandler/pathContext.go

@@ -3,7 +3,7 @@ package serverHandler
 type pathContext struct {
 	simple      bool
 	download    bool
-	sort        *string // keep different for param is not specified or is empty
+	sort        string
 	defaultSort string
 }
 
@@ -19,10 +19,10 @@ func (ctx pathContext) QueryString() string {
 		buffer = append(buffer, []byte("download&")...) // 9 bytes
 	}
 
-	if ctx.sort != nil && *(ctx.sort) != ctx.defaultSort {
-		buffer = append(buffer, []byte("sort=")...)   // 5 bytes
-		buffer = append(buffer, []byte(*ctx.sort)...) // 2 bytes
-		buffer = append(buffer, '&')                  // 1 byte
+	if len(ctx.sort) > 0 && ctx.sort != ctx.defaultSort {
+		buffer = append(buffer, []byte("sort=")...)  // 5 bytes
+		buffer = append(buffer, []byte(ctx.sort)...) // 2 bytes
+		buffer = append(buffer, '&')                 // 1 byte
 	}
 
 	buffer = buffer[:len(buffer)-1]
@@ -31,7 +31,7 @@ func (ctx pathContext) QueryString() string {
 
 func (ctx pathContext) QueryStringOfSort(sort string) string {
 	copiedCtx := ctx
-	copiedCtx.sort = &sort
+	copiedCtx.sort = sort
 	return copiedCtx.QueryString()
 }
 

src/serverHandler/pathContext_test.go

@@ -14,25 +14,25 @@ func TestPathContext(t *testing.T) {
 	}
 
 	sort = ""
-	result = (&pathContext{defaultSort: "/n", sort: &sort}).QueryString()
-	if result != "?sort=" {
+	result = (&pathContext{defaultSort: "/n", sort: sort}).QueryString()
+	if result != "" {
 		t.Error(result)
 	}
 
 	sort = "/n"
-	result = (&pathContext{defaultSort: "/n", sort: &sort}).QueryString()
+	result = (&pathContext{defaultSort: "/n", sort: sort}).QueryString()
 	if result != "" {
 		t.Error(result)
 	}
 
 	sort = ""
-	result = (&pathContext{sort: &sort}).QueryString()
+	result = (&pathContext{sort: sort}).QueryString()
 	if result != "" {
 		t.Error(result)
 	}
 
 	sort = "/n"
-	result = (&pathContext{sort: &sort}).QueryString()
+	result = (&pathContext{sort: sort}).QueryString()
 	if result != "?sort=/n" {
 		t.Error(result)
 	}
@@ -58,25 +58,25 @@ func TestPathContext(t *testing.T) {
 	}
 
 	sort = "/n"
-	result = (&pathContext{simple: false, sort: &sort}).QueryString()
+	result = (&pathContext{simple: false, sort: sort}).QueryString()
 	if result != "?sort=/n" {
 		t.Error(result)
 	}
 
 	sort = "/n"
-	result = (&pathContext{simple: true, sort: &sort}).QueryString()
+	result = (&pathContext{simple: true, sort: sort}).QueryString()
 	if result != "?simple&sort=/n" {
 		t.Error(result)
 	}
 
 	sort = "/n"
-	result = (&pathContext{download: true, sort: &sort}).QueryString()
+	result = (&pathContext{download: true, sort: sort}).QueryString()
 	if result != "?download&sort=/n" {
 		t.Error(result)
 	}
 
 	sort = "/n"
-	result = (&pathContext{simple: true, download: true, sort: &sort}).QueryString()
+	result = (&pathContext{simple: true, download: true, sort: sort}).QueryString()
 	if result != "?simple&download&sort=/n" {
 		t.Error(result)
 	}

src/serverHandler/sessionData.go

@@ -484,7 +484,11 @@ func (h *aliasHandler) getSessionData(r *http.Request) (session *sessionContext,
 	}
 
 	subItems = h.FilterItems(subItems)
-	rawSortBy, sortState := sortInfos(subItems, query.Get("sort"), h.defaultSort)
+	sort := query.Get("sort")
+	if len(sort) > 2 {
+		sort = sort[:2]
+	}
+	sortState := sortInfos(subItems, sort, h.defaultSort)
 
 	if h.emptyRoot && status == http.StatusOK && len(vhostReqPath) > 1 {
 		status = http.StatusNotFound
@@ -566,7 +570,7 @@ func (h *aliasHandler) getSessionData(r *http.Request) (session *sessionContext,
 		Context: pathContext{
 			simple:      isSimple,
 			download:    isDownload,
-			sort:        rawSortBy,
+			sort:        sort,
 			defaultSort: h.defaultSort,
 		},
 	}

src/serverHandler/sort.go

@@ -357,13 +357,10 @@ func sortInfoOriginal(items []os.FileInfo, compareDir fnCompareDir) {
 
 // sort
 
-func sortInfos(items []os.FileInfo, sortBy string, defaultSortBy string) (rawSortBy *string, sortInfo SortState) {
+func sortInfos(items []os.FileInfo, sortBy string, defaultSortBy string) (sortInfo SortState) {
 	if len(sortBy) == 0 {
 		sortBy = defaultSortBy
-	} else {
-		rawSortBy = &sortBy
 	}
-
 	if len(sortBy) == 0 {
 		return
 	}
@@ -413,5 +410,5 @@ func sortInfos(items []os.FileInfo, sortBy string, defaultSortBy string) (rawSor
 		}
 	}
 
-	return rawSortBy, SortState{dirSort, sortKey}
+	return SortState{dirSort, sortKey}
 }