refactor(alias): rename fs to dir

Author: marjune163

src/serverHandler/alias.go

@@ -7,7 +7,7 @@ import (
 
 type alias struct {
 	url string
-	fs  string
+	dir string
 }
 
 func createAlias(urlPath, fsPath string) alias {

src/serverHandler/aliasHandler.go

@@ -162,12 +162,12 @@ func newAliasHandler(
 
 	globalRestrictAccess := p.GlobalRestrictAccess
 	globalRestrictAccess = vhostCtx.restrictAccessUrls.mergePrefixMatched(globalRestrictAccess, util.HasUrlPrefixDir, currentAlias.url)
-	globalRestrictAccess = vhostCtx.restrictAccessDirs.mergePrefixMatched(globalRestrictAccess, util.HasFsPrefixDir, currentAlias.fs)
+	globalRestrictAccess = vhostCtx.restrictAccessDirs.mergePrefixMatched(globalRestrictAccess, util.HasFsPrefixDir, currentAlias.dir)
 	globalRestrictAccess = util.InPlaceDedup(globalRestrictAccess)
 
 	globalHeaders := p.GlobalHeaders
 	globalHeaders = vhostCtx.headersUrls.mergePrefixMatched(globalHeaders, util.HasUrlPrefixDir, currentAlias.url)
-	globalHeaders = vhostCtx.headersDirs.mergePrefixMatched(globalHeaders, util.HasFsPrefixDir, currentAlias.fs)
+	globalHeaders = vhostCtx.headersDirs.mergePrefixMatched(globalHeaders, util.HasFsPrefixDir, currentAlias.dir)
 
 	h := &aliasHandler{
 		alias:        currentAlias,
@@ -186,21 +186,21 @@ func newAliasHandler(
 		dirIndexes: p.DirIndexes,
 		aliases:    allAliases.filterSuccessor(currentAlias.url),
 
-		auth:    newHierarchyAvailability(currentAlias.url, currentAlias.fs, p.GlobalAuth, p.AuthUrls, vhostCtx.authUrlsUsers, p.AuthDirs, vhostCtx.authDirsUsers),
-		index:   newHierarchyAvailability(currentAlias.url, currentAlias.fs, false, p.IndexUrls, vhostCtx.indexUrlsUsers, p.IndexDirs, vhostCtx.indexDirsUsers),
-		upload:  newHierarchyAvailability(currentAlias.url, currentAlias.fs, p.GlobalUpload, p.UploadUrls, vhostCtx.uploadUrlsUsers, p.UploadDirs, vhostCtx.uploadDirsUsers),
-		mkdir:   newHierarchyAvailability(currentAlias.url, currentAlias.fs, p.GlobalMkdir, p.MkdirUrls, vhostCtx.mkdirUrlsUsers, p.MkdirDirs, vhostCtx.mkdirDirsUsers),
-		delete:  newHierarchyAvailability(currentAlias.url, currentAlias.fs, p.GlobalDelete, p.DeleteUrls, vhostCtx.deleteUrlsUsers, p.DeleteDirs, vhostCtx.deleteDirsUsers),
-		archive: newHierarchyAvailability(currentAlias.url, currentAlias.fs, p.GlobalArchive, p.ArchiveUrls, vhostCtx.archiveUrlsUsers, p.ArchiveDirs, vhostCtx.archiveDirsUsers),
-		cors:    newHierarchyAvailability(currentAlias.url, currentAlias.fs, p.GlobalCors, p.CorsUrls, nil, p.CorsDirs, nil),
+		auth:    newHierarchyAvailability(currentAlias.url, currentAlias.dir, p.GlobalAuth, p.AuthUrls, vhostCtx.authUrlsUsers, p.AuthDirs, vhostCtx.authDirsUsers),
+		index:   newHierarchyAvailability(currentAlias.url, currentAlias.dir, false, p.IndexUrls, vhostCtx.indexUrlsUsers, p.IndexDirs, vhostCtx.indexDirsUsers),
+		upload:  newHierarchyAvailability(currentAlias.url, currentAlias.dir, p.GlobalUpload, p.UploadUrls, vhostCtx.uploadUrlsUsers, p.UploadDirs, vhostCtx.uploadDirsUsers),
+		mkdir:   newHierarchyAvailability(currentAlias.url, currentAlias.dir, p.GlobalMkdir, p.MkdirUrls, vhostCtx.mkdirUrlsUsers, p.MkdirDirs, vhostCtx.mkdirDirsUsers),
+		delete:  newHierarchyAvailability(currentAlias.url, currentAlias.dir, p.GlobalDelete, p.DeleteUrls, vhostCtx.deleteUrlsUsers, p.DeleteDirs, vhostCtx.deleteDirsUsers),
+		archive: newHierarchyAvailability(currentAlias.url, currentAlias.dir, p.GlobalArchive, p.ArchiveUrls, vhostCtx.archiveUrlsUsers, p.ArchiveDirs, vhostCtx.archiveDirsUsers),
+		cors:    newHierarchyAvailability(currentAlias.url, currentAlias.dir, p.GlobalCors, p.CorsUrls, nil, p.CorsDirs, nil),
 
 		globalRestrictAccess: globalRestrictAccess,
 		restrictAccessUrls:   vhostCtx.restrictAccessUrls.filterSuccessor(false, util.HasUrlPrefixDir, currentAlias.url),
-		restrictAccessDirs:   vhostCtx.restrictAccessDirs.filterSuccessor(false, util.HasFsPrefixDir, currentAlias.fs),
+		restrictAccessDirs:   vhostCtx.restrictAccessDirs.filterSuccessor(false, util.HasFsPrefixDir, currentAlias.dir),
 
 		globalHeaders: globalHeaders,
 		headersUrls:   vhostCtx.headersUrls.filterSuccessor(false, util.HasUrlPrefixDir, currentAlias.url),
-		headersDirs:   vhostCtx.headersDirs.filterSuccessor(false, util.HasFsPrefixDir, currentAlias.fs),
+		headersDirs:   vhostCtx.headersDirs.filterSuccessor(false, util.HasFsPrefixDir, currentAlias.dir),
 
 		shows:     vhostCtx.shows,
 		showDirs:  vhostCtx.showDirs,

src/serverHandler/archive.go

@@ -128,7 +128,7 @@ func (h *aliasHandler) visitTreeNode(
 			childRelPath := relPath + childPath
 
 			if childAlias, hasChildAlias := h.aliases.byUrlPath(childRawReqPath); hasChildAlias {
-				h.visitTreeNode(r, childRawReqPath, childAlias.fs, childRelPath, true, childChildSelections, archiveCallback)
+				h.visitTreeNode(r, childRawReqPath, childAlias.dir, childRelPath, true, childChildSelections, archiveCallback)
 			} else {
 				h.visitTreeNode(r, childRawReqPath, childFsPath, childRelPath, statNode, childChildSelections, archiveCallback)
 			}

src/serverHandler/middleware.go

@@ -15,7 +15,7 @@ func (h *aliasHandler) applyMiddlewares(mids []middleware.Middleware, w http.Res
 		VhostReqPath:  session.vhostReqPath,
 		AliasReqPath:  session.aliasReqPath,
 		AliasFsPath:   session.fsPath,
-		AliasFsRoot:   h.fs,
+		AliasFsRoot:   h.dir,
 
 		WantJson: session.wantJson,
 

src/serverHandler/mutate.go

@@ -13,21 +13,21 @@ func (h *aliasHandler) mutate(w http.ResponseWriter, r *http.Request, session *s
 	switch {
 	case session.isUpload:
 		if data.CanUpload {
-			ok = h.saveUploadFiles(data.AuthUserName, h.fs+session.aliasReqPath, data.CanMkdir, data.CanDelete, data.AliasSubItems, r)
+			ok = h.saveUploadFiles(data.AuthUserName, h.dir+session.aliasReqPath, data.CanMkdir, data.CanDelete, data.AliasSubItems, r)
 		} else {
 			data.Status = http.StatusBadRequest
 			return
 		}
 	case session.isMkdir:
 		if data.CanMkdir && !h.logError(r.ParseForm()) {
-			ok = h.mkdirs(data.AuthUserName, h.fs+session.aliasReqPath, r.Form["name"], data.AliasSubItems, r)
+			ok = h.mkdirs(data.AuthUserName, h.dir+session.aliasReqPath, r.Form["name"], data.AliasSubItems, r)
 		} else {
 			data.Status = http.StatusBadRequest
 			return
 		}
 	case session.isDelete:
 		if data.CanDelete && !h.logError(r.ParseForm()) {
-			ok = h.deleteItems(data.AuthUserName, h.fs+session.aliasReqPath, r.Form["name"], data.AliasSubItems, r)
+			ok = h.deleteItems(data.AuthUserName, h.dir+session.aliasReqPath, r.Form["name"], data.AliasSubItems, r)
 		} else {
 			data.Status = http.StatusBadRequest
 			return

src/serverHandler/sessionData.go

@@ -216,7 +216,7 @@ func (h *aliasHandler) mergeAlias(
 		var fsItem os.FileInfo
 		if noMore { // reached second-deepest path of alias
 			var err error
-			fsItem, err = os.Stat(alias.fs)
+			fsItem, err = os.Stat(alias.dir)
 			if err != nil {
 				errs = append(errs, err)
 			}
@@ -297,7 +297,7 @@ func (h *aliasHandler) statIndexFile(rawReqPath, baseDir string, baseItem os.Fil
 			if !alias.isMatch(path.Clean(rawReqPath + "/" + index)) {
 				continue
 			}
-			file, item, err = stat(alias.fs, true)
+			file, item, err = stat(alias.dir, true)
 			if err != nil && file != nil {
 				file.Close()
 			}
@@ -353,7 +353,7 @@ func (h *aliasHandler) getSessionData(r *http.Request) (session *sessionContext,
 	tailSlash := vhostReqPath[len(vhostReqPath)-1] == '/'
 
 	reqPath := util.CleanUrlPath(vhostReqPath[len(h.url):])
-	fsPath := filepath.Clean(h.fs + reqPath)
+	fsPath := filepath.Clean(h.dir + reqPath)
 
 	rawQuery := r.URL.RawQuery