refactor: rename path-values type data prop to values

Author: marjune163

src/serverHandler/header.go

@@ -43,13 +43,13 @@ func (h *aliasHandler) getHeaders(reqUrlPath, reqFsPath string, doGetHeaders boo
 
 	for i := range h.headersUrls {
 		if util.HasUrlPrefixDir(reqUrlPath, h.headersUrls[i].path) {
-			headers = append(headers, h.headersUrls[i].headers...)
+			headers = append(headers, h.headersUrls[i].values...)
 		}
 	}
 
 	for i := range h.headersDirs {
 		if util.HasFsPrefixDir(reqFsPath, h.headersDirs[i].path) {
-			headers = append(headers, h.headersDirs[i].headers...)
+			headers = append(headers, h.headersDirs[i].values...)
 		}
 	}
 

src/serverHandler/pathValues.go

@@ -7,8 +7,8 @@ type prefixFilter func(whole, prefix string) bool
 // pathInts
 
 type pathInts struct {
-	path string
-	ints []int
+	path   string
+	values []int
 }
 
 type pathIntsList []pathInts
@@ -25,7 +25,7 @@ func (list pathIntsList) mergePrefixMatched(mergeWith []int, matchPrefix prefixF
 			if result == nil {
 				result = []int{}
 			}
-			result = append(result, list[i].ints...)
+			result = append(result, list[i].values...)
 		}
 	}
 
@@ -58,8 +58,8 @@ func (list pathIntsList) filterSuccessor(includeSelf bool, matchPrefix prefixFil
 // pathStrings
 
 type pathStrings struct {
-	path    string
-	strings []string
+	path   string
+	values []string
 }
 
 type pathStringsList []pathStrings
@@ -76,7 +76,7 @@ func (list pathStringsList) mergePrefixMatched(mergeWith []string, matchPrefix p
 			if result == nil {
 				result = []string{}
 			}
-			result = append(result, list[i].strings...)
+			result = append(result, list[i].values...)
 		}
 	}
 
@@ -109,8 +109,8 @@ func (list pathStringsList) filterSuccessor(includeSelf bool, matchPrefix prefix
 // pathHeaders
 
 type pathHeaders struct {
-	path    string
-	headers [][2]string
+	path   string
+	values [][2]string
 }
 
 type pathHeadersList []pathHeaders
@@ -127,7 +127,7 @@ func (list pathHeadersList) mergePrefixMatched(mergeWith [][2]string, matchPrefi
 			if result == nil {
 				result = [][2]string{}
 			}
-			result = append(result, list[i].headers...)
+			result = append(result, list[i].values...)
 		}
 	}
 

src/serverHandler/perm.go

@@ -30,7 +30,7 @@ func hasUrlOrDirPrefixUsers(urlsUsers pathIntsList, reqUrl string, dirsUsers pat
 		if userId < 0 {
 			continue
 		}
-		for _, uid := range urlsUsers[i].ints {
+		for _, uid := range urlsUsers[i].values {
 			if uid == userId {
 				match = true
 				return
@@ -46,7 +46,7 @@ func hasUrlOrDirPrefixUsers(urlsUsers pathIntsList, reqUrl string, dirsUsers pat
 		if userId < 0 {
 			continue
 		}
-		for _, uid := range dirsUsers[i].ints {
+		for _, uid := range dirsUsers[i].values {
 			if uid == userId {
 				match = true
 				return

src/serverHandler/restrictAccess.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 )
 
-func newRestrictAccesses(pathHostsList [][]string) []pathStrings {
-	restricts := make([]pathStrings, 0, len(pathHostsList))
+func newRestrictAccesses(pathHostsList [][]string) pathStringsList {
+	restricts := make(pathStringsList, 0, len(pathHostsList))
 
 	for _, pathHosts := range pathHostsList {
 		if len(pathHosts) == 0 {
@@ -51,7 +51,7 @@ func (h *aliasHandler) isAllowAccess(r *http.Request, reqUrlPath, reqFsPath stri
 			continue
 		}
 		urlMatched = true
-		if util.Contains(h.restrictAccessUrls[i].strings, sourceHost) {
+		if util.Contains(h.restrictAccessUrls[i].values, sourceHost) {
 			return true, true
 		}
 	}
@@ -62,7 +62,7 @@ func (h *aliasHandler) isAllowAccess(r *http.Request, reqUrlPath, reqFsPath stri
 			continue
 		}
 		dirMatched = true
-		if util.Contains(h.restrictAccessDirs[i].strings, sourceHost) {
+		if util.Contains(h.restrictAccessDirs[i].values, sourceHost) {
 			return true, true
 		}
 	}

src/serverHandler/util.go

@@ -17,13 +17,13 @@ func pathUsernamesToPathUids(users *user.List, pathsUsernames [][]string) pathIn
 			continue
 		}
 		pathIds := pathInts{
-			path: pathUsernames[0],
-			ints: make([]int, 0, len(pathUsernames)-1),
+			path:   pathUsernames[0],
+			values: make([]int, 0, len(pathUsernames)-1),
 		}
 		for _, username := range pathUsernames[1:] {
 			uid := users.FindIndex(username)
 			if uid >= 0 {
-				pathIds.ints = append(pathIds.ints, uid)
+				pathIds.values = append(pathIds.values, uid)
 			}
 		}
 		list = append(list, pathIds)