refactor(serverHandler): extract mutate flag to responseData

Author: marjune163

src/serverHandler/main.go

@@ -89,24 +89,22 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		h.cors(w, r)
 	}
 
-	switch {
-	case r.URL.RawQuery == "upload":
-		if data.CanUpload && r.Method == http.MethodPost {
-			h.saveUploadFiles(h.root+data.handlerReqPath, data.CanDelete, data.AliasSubItems, r)
-		}
-		http.Redirect(w, r, r.URL.Path, http.StatusFound)
-		return
-	case strings.HasPrefix(r.URL.RawQuery, "mkdir"):
-		if data.CanMkdir {
-			h.errHandler.LogError(r.ParseForm())
-			h.mkdirs(h.root+data.handlerReqPath, r.Form["name"], data.AliasSubItems)
-		}
-		http.Redirect(w, r, r.URL.Path, http.StatusFound)
-		return
-	case strings.HasPrefix(r.URL.RawQuery, "delete"):
-		if data.CanDelete {
-			h.errHandler.LogError(r.ParseForm())
-			h.deleteItems(h.root+data.handlerReqPath, r.Form["name"], data.AliasSubItems)
+	if data.IsMutate {
+		switch {
+		case data.IsUpload:
+			if data.CanUpload && r.Method == http.MethodPost {
+				h.saveUploadFiles(h.root+data.handlerReqPath, data.CanDelete, data.AliasSubItems, r)
+			}
+		case data.IsMkdir:
+			if data.CanMkdir {
+				h.errHandler.LogError(r.ParseForm())
+				h.mkdirs(h.root+data.handlerReqPath, r.Form["name"], data.AliasSubItems)
+			}
+		case data.IsDelete:
+			if data.CanDelete {
+				h.errHandler.LogError(r.ParseForm())
+				h.deleteItems(h.root+data.handlerReqPath, r.Form["name"], data.AliasSubItems)
+			}
 		}
 		http.Redirect(w, r, r.URL.Path, http.StatusFound)
 		return

src/serverHandler/responseData.go

@@ -50,6 +50,12 @@ type responseData struct {
 	CanArchive   bool
 	CanCors      bool
 	NeedAuth     bool
+
+	IsUpload bool
+	IsMkdir  bool
+	IsDelete bool
+	IsMutate bool
+	WantJson bool
 }
 
 func isSlash(c rune) bool {
@@ -264,7 +270,7 @@ func (h *handler) stateIndexFile(rawReqPath, baseDir string, baseItem os.FileInf
 	return nil, nil, nil
 }
 
-func (h *handler) getResponseData(r *http.Request) (data *responseData) {
+func (h *handler) getResponseData(r *http.Request) *responseData {
 	requestUri := r.URL.Path
 	tailSlash := requestUri[len(requestUri)-1] == '/'
 
@@ -338,7 +344,25 @@ func (h *handler) getResponseData(r *http.Request) (data *responseData) {
 	canCors := h.getCanCors(rawReqPath, reqFsPath)
 	needAuth := h.getNeedAuth(rawReqPath, reqFsPath)
 
-	data = &responseData{
+	rawQuery := r.URL.RawQuery
+	isUpload := false
+	isMkdir := false
+	isDelete := false
+	isMutate := false
+	switch {
+	case strings.HasPrefix(rawQuery, "upload") && r.Method == http.MethodPost:
+		isUpload = true
+		isMutate = true
+	case strings.HasPrefix(rawQuery, "mkdir"):
+		isMkdir = true
+		isMutate = true
+	case strings.HasPrefix(r.URL.RawQuery, "delete"):
+		isDelete = true
+		isMutate = true
+	}
+	wantJson := strings.Contains(rawQuery, "json")
+
+	return &responseData{
 		rawReqPath:     rawReqPath,
 		handlerReqPath: reqPath,
 
@@ -364,7 +388,11 @@ func (h *handler) getResponseData(r *http.Request) (data *responseData) {
 		CanArchive:   canArchive,
 		CanCors:      canCors,
 		NeedAuth:     needAuth,
-	}
 
-	return
+		IsUpload: isUpload,
+		IsMkdir:  isMkdir,
+		IsDelete: isDelete,
+		IsMutate: isMutate,
+		WantJson: wantJson,
+	}
 }