feat(serverHandler): add json response for mutate action

Author: marjune163

src/serverHandler/delete.go

@@ -4,7 +4,7 @@ import (
 	"os"
 )
 
-func (h *handler) deleteItems(fsPrefix string, files []string, aliasSubItems []os.FileInfo) {
+func (h *handler) deleteItems(fsPrefix string, files []string, aliasSubItems []os.FileInfo) bool {
 	errs := []error{}
 
 	for _, filename := range files {
@@ -19,5 +19,8 @@ func (h *handler) deleteItems(fsPrefix string, files []string, aliasSubItems []o
 
 	if len(errs) > 0 {
 		go h.logger.LogErrors(errs...)
+		return false
 	}
+
+	return true
 }

src/serverHandler/main.go

@@ -90,23 +90,7 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	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)
+		h.mutate(w, r, data)
 		return
 	}
 
@@ -127,7 +111,7 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	item := data.Item
-	if r.URL.RawQuery == "json" {
+	if data.WantJson {
 		h.json(w, r, data)
 	} else if file != nil && item != nil && !item.IsDir() {
 		h.content(w, r, data)

src/serverHandler/mkdir.go

@@ -4,7 +4,7 @@ import (
 	"os"
 )
 
-func (h *handler) mkdirs(fsPrefix string, files []string, aliasSubItems []os.FileInfo) {
+func (h *handler) mkdirs(fsPrefix string, files []string, aliasSubItems []os.FileInfo) bool {
 	errs := []error{}
 
 	for _, filename := range files {
@@ -19,5 +19,8 @@ func (h *handler) mkdirs(fsPrefix string, files []string, aliasSubItems []os.Fil
 
 	if len(errs) > 0 {
 		go h.logger.LogErrors(errs...)
+		return false
 	}
+
+	return true
 }

src/serverHandler/mutate.go

@@ -0,0 +1,39 @@
+package serverHandler
+
+import "net/http"
+
+func (h *handler) mutate(w http.ResponseWriter, r *http.Request, data *responseData) {
+	success := false
+
+	switch {
+	case data.IsUpload:
+		if data.CanUpload && r.Method == http.MethodPost {
+			success = h.saveUploadFiles(h.root+data.handlerReqPath, data.CanDelete, data.AliasSubItems, r)
+		}
+	case data.IsMkdir:
+		if data.CanMkdir && !h.errHandler.LogError(r.ParseForm()) {
+			success = h.mkdirs(h.root+data.handlerReqPath, r.Form["name"], data.AliasSubItems)
+		}
+	case data.IsDelete:
+		if data.CanDelete && !h.errHandler.LogError(r.ParseForm()) {
+			success = h.deleteItems(h.root+data.handlerReqPath, r.Form["name"], data.AliasSubItems)
+		}
+	}
+
+	if data.WantJson {
+		header := w.Header()
+		header.Set("Content-Type", "application/json; charset=utf-8")
+		header.Set("Cache-Control", "public, max-age=0")
+		w.WriteHeader(http.StatusOK)
+
+		w.Write([]byte{'{', '"', 's', 'u', 'c', 'c', 'e', 's', 's', '"', ':'})
+		if success {
+			w.Write([]byte{'t', 'r', 'u', 'e'})
+		} else {
+			w.Write([]byte{'f', 'a', 'l', 's', 'e'})
+		}
+		w.Write([]byte{'}'})
+	} else {
+		http.Redirect(w, r, r.URL.Path, http.StatusFound)
+	}
+}

src/serverHandler/responseData.go

@@ -360,7 +360,7 @@ func (h *handler) getResponseData(r *http.Request) *responseData {
 		isDelete = true
 		isMutate = true
 	}
-	wantJson := strings.Contains(rawQuery, "json")
+	wantJson := strings.HasPrefix(rawQuery, "json") || strings.Contains(rawQuery, "&json")
 
 	return &responseData{
 		rawReqPath:     rawReqPath,

src/serverHandler/upload.go

@@ -36,13 +36,13 @@ func getAvailableFilename(fsPrefix, filename string, mustAppendSuffix bool) stri
 	return ""
 }
 
-func (h *handler) saveUploadFiles(fsPrefix string, overwriteExists bool, aliasSubItems []os.FileInfo, r *http.Request) {
+func (h *handler) saveUploadFiles(fsPrefix string, overwriteExists bool, aliasSubItems []os.FileInfo, r *http.Request) bool {
 	errs := []error{}
 
 	reader, err := r.MultipartReader()
 	if err != nil {
 		errs = append(errs, err)
-		return
+		return false
 	}
 
 	for {
@@ -110,5 +110,8 @@ func (h *handler) saveUploadFiles(fsPrefix string, overwriteExists bool, aliasSu
 
 	if len(errs) > 0 {
 		go h.logger.LogErrors(errs...)
+		return false
 	}
+
+	return true
 }