refactor(serverHandler): simplify getSubItemPrefix

marjune163 · marjune163 · commit 487b4f48223b · 2020-03-12T18:38:25.000+08:00
diff --git a/src/serverHandler/responseData.go b/src/serverHandler/responseData.go
@@ -183,13 +183,12 @@ func (h *handler) mergeAlias(rawRequestPath string, item os.FileInfo, subItems [
 	return subItems, errs
 }
 
-func getSubItemPrefix(requestPath string, tailSlash bool) (subItemPrefix string) {
+func getSubItemPrefix(requestPath string, tailSlash bool) string {
 	if tailSlash {
-		subItemPrefix = "./"
+		return "./"
 	} else {
-		subItemPrefix = "./" + path.Base(requestPath) + "/"
+		return "./" + path.Base(requestPath) + "/"
 	}
-	return
 }
 
 func getItemName(info os.FileInfo, r *http.Request) (itemName string) {

Original file line number	Diff line number	Diff line change
`@@ -183,13 +183,12 @@ func (h *handler) mergeAlias(rawRequestPath string, item os.FileInfo, subItems [`
`183`	`183`	`return subItems, errs`
`184`	`184`	`}`
`185`	`185`
`186`		`-func getSubItemPrefix(requestPath string, tailSlash bool) (subItemPrefix string) {`
	`186`	`+func getSubItemPrefix(requestPath string, tailSlash bool) string {`
`187`	`187`	`if tailSlash {`
`188`		`- subItemPrefix = "./"`
	`188`	`+ return "./"`
`189`	`189`	`} else {`
`190`		`- subItemPrefix = "./" + path.Base(requestPath) + "/"`
	`190`	`+ return "./" + path.Base(requestPath) + "/"`
`191`	`191`	`}`
`192`		`- return`
`193`	`192`	`}`
`194`	`193`
`195`	`194`	`func getItemName(info os.FileInfo, r *http.Request) (itemName string) {`