refactor(sessionData): adjust session data

- move mutation action info to `sessionContext`
- move archive action info to `sessionContext`
- extract archive format enum

Author: marjune163

src/serverHandler/aliasHandler.go

@@ -118,19 +118,19 @@ func (h *aliasHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 		header(w, session.headers)
 
-		if data.IsMutate && h.mutate(w, r, session, data) {
+		if session.isMutate && h.mutate(w, r, session, data) {
 			return
-		} else if data.IsArchive {
-			switch data.ArchiveFormat {
-			case "tar":
+		} else if session.isArchive {
+			switch session.archiveFormat {
+			case tarFmt:
 				if h.tar(w, r, session, data) {
 					return
 				}
-			case "tgz":
+			case tgzFmt:
 				if h.tgz(w, r, session, data) {
 					return
 				}
-			case "zip":
+			case zipFmt:
 				if h.zip(w, r, session, data) {
 					return
 				}

src/serverHandler/mutate.go

@@ -11,21 +11,21 @@ func (h *aliasHandler) mutate(w http.ResponseWriter, r *http.Request, session *s
 	}
 
 	switch {
-	case data.IsUpload:
+	case session.isUpload:
 		if data.CanUpload {
 			ok = h.saveUploadFiles(data.AuthUserName, h.fs+session.aliasReqPath, data.CanMkdir, data.CanDelete, data.AliasSubItems, r)
 		} else {
 			data.Status = http.StatusBadRequest
 			return
 		}
-	case data.IsMkdir:
+	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)
 		} else {
 			data.Status = http.StatusBadRequest
 			return
 		}
-	case data.IsDelete:
+	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)
 		} else {

src/serverHandler/sessionData.go

@@ -12,12 +12,22 @@ import (
 	"strings"
 )
 
+type redirectAction int
+
 const (
 	noRedirect redirectAction = iota
 	addSlashSuffix
 	removeSlashSuffix
 )
 
+type archiveFormat int
+
+const (
+	tarFmt archiveFormat = iota
+	tgzFmt
+	zipFmt
+)
+
 const contentTypeJson = "application/json"
 
 var acceptContentTypes = []string{
@@ -41,8 +51,6 @@ type itemHtml struct {
 	DeleteUrl   string
 }
 
-type redirectAction int
-
 type sessionContext struct {
 	prefixReqPath string
 	vhostReqPath  string
@@ -62,6 +70,14 @@ type sessionContext struct {
 
 	wantJson bool
 
+	isUpload bool
+	isMkdir  bool
+	isDelete bool
+	isMutate bool
+
+	isArchive     bool
+	archiveFormat archiveFormat
+
 	file *os.File
 
 	errors []error
@@ -72,12 +88,6 @@ type responseData struct {
 
 	IsDownload     bool
 	IsDownloadFile bool
-	IsUpload       bool
-	IsMkdir        bool
-	IsDelete       bool
-	IsMutate       bool
-	IsArchive      bool
-	ArchiveFormat  string
 
 	CanIndex     bool
 	CanUpload    bool
@@ -382,19 +392,18 @@ func (h *aliasHandler) getSessionData(r *http.Request) (session *sessionContext,
 	}
 
 	isArchive := false
-	archiveFormat := ""
+	var arFmt archiveFormat
 	if len(rawQuery) == 3 || (len(rawQuery) > 3 && rawQuery[3] == '&') {
-		rawQuery3 := rawQuery[:3]
-		switch rawQuery3 {
+		switch rawQuery[:3] {
 		case "tar":
 			isArchive = true
-			archiveFormat = rawQuery3
+			arFmt = tarFmt
 		case "tgz":
 			isArchive = true
-			archiveFormat = rawQuery3
+			arFmt = tgzFmt
 		case "zip":
 			isArchive = true
-			archiveFormat = rawQuery3
+			arFmt = zipFmt
 		}
 	}
 
@@ -494,13 +503,6 @@ func (h *aliasHandler) getSessionData(r *http.Request) (session *sessionContext,
 	canCors := allowAccess && authSuccess && h.cors.match(vhostReqPath, fsPath, authUserId)
 	loginAvail := len(authUserName) == 0 && h.users.Len() > 0
 
-	context := pathContext{
-		download:     isDownload,
-		downloadfile: isDownloadFile,
-		sort:         rawSortBy,
-		defaultSort:  h.defaultSort,
-	}
-
 	session = &sessionContext{
 		prefixReqPath: prefixReqPath,
 		vhostReqPath:  vhostReqPath,
@@ -520,6 +522,14 @@ func (h *aliasHandler) getSessionData(r *http.Request) (session *sessionContext,
 
 		wantJson: wantJson,
 
+		isUpload: isUpload,
+		isMkdir:  isMkdir,
+		isDelete: isDelete,
+		isMutate: isMutate,
+
+		isArchive:     isArchive,
+		archiveFormat: arFmt,
+
 		file: file,
 
 		errors: errs,
@@ -529,12 +539,6 @@ func (h *aliasHandler) getSessionData(r *http.Request) (session *sessionContext,
 
 		IsDownload:     isDownload,
 		IsDownloadFile: isDownloadFile,
-		IsUpload:       isUpload,
-		IsMkdir:        isMkdir,
-		IsDelete:       isDelete,
-		IsMutate:       isMutate,
-		IsArchive:      isArchive,
-		ArchiveFormat:  archiveFormat,
 
 		CanIndex:     canIndex,
 		CanUpload:    canUpload,
@@ -559,7 +563,12 @@ func (h *aliasHandler) getSessionData(r *http.Request) (session *sessionContext,
 		SubItemsHtml:  nil,
 		SubItemPrefix: subItemPrefix,
 		SortState:     sortState,
-		Context:       context,
+		Context: pathContext{
+			download:     isDownload,
+			downloadfile: isDownloadFile,
+			sort:         rawSortBy,
+			defaultSort:  h.defaultSort,
+		},
 	}
 	return
 }