refactor(serverHandler): rename pageData to responseData

Author: marjune163

src/serverHandler/archiveTar.go

@@ -45,7 +45,7 @@ func writeTar(tw *tar.Writer, f *os.File, fInfo os.FileInfo, archivePath string)
 	return nil
 }
 
-func (h *handler) tar(w http.ResponseWriter, r *http.Request, pageData *pageData) {
+func (h *handler) tar(w http.ResponseWriter, r *http.Request, pageData *responseData) {
 	tw := tar.NewWriter(w)
 	defer func() {
 		err := tw.Close()
@@ -69,7 +69,7 @@ func (h *handler) tar(w http.ResponseWriter, r *http.Request, pageData *pageData
 	)
 }
 
-func (h *handler) tgz(w http.ResponseWriter, r *http.Request, pageData *pageData) {
+func (h *handler) tgz(w http.ResponseWriter, r *http.Request, pageData *responseData) {
 	gzw, err := gzip.NewWriterLevel(w, gzip.BestSpeed)
 	if h.errHandler.LogError(err) {
 		return

src/serverHandler/archiveZip.go

@@ -44,7 +44,7 @@ func writeZip(zw *zip.Writer, f *os.File, fInfo os.FileInfo, archivePath string)
 	return nil
 }
 
-func (h *handler) zip(w http.ResponseWriter, r *http.Request, pageData *pageData) {
+func (h *handler) zip(w http.ResponseWriter, r *http.Request, pageData *responseData) {
 	zipWriter := zip.NewWriter(w)
 	defer func() {
 		err := zipWriter.Close()

src/serverHandler/main.go

@@ -50,50 +50,50 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	pageData, notFound, internalError := h.getPageData(r)
-	if len(pageData.Errors) > 0 {
+	data, notFound, internalError := h.getResponseData(r)
+	if len(data.Errors) > 0 {
 		go func() {
-			for _, err := range pageData.Errors {
+			for _, err := range data.Errors {
 				h.errHandler.LogError(err)
 			}
 		}()
 	}
-	file := pageData.File
+	file := data.File
 	if file != nil {
 		defer func() {
 			err := file.Close()
 			h.errHandler.LogError(err)
 		}()
 	}
 
-	if pageData.CanUpload && r.Method == "POST" {
-		h.saveUploadFiles(pageData.handlerReqPath, r)
+	if data.CanUpload && r.Method == "POST" {
+		h.saveUploadFiles(data.handlerReqPath, r)
 		http.Redirect(w, r, r.RequestURI, http.StatusFound)
 		return
 	}
 
-	if pageData.CanCors {
+	if data.CanCors {
 		h.cors(w, r)
 		if r.Method == "OPTIONS" {
 			return
 		}
 	}
 
-	if pageData.CanArchive && len(r.URL.RawQuery) > 0 {
+	if data.CanArchive && len(r.URL.RawQuery) > 0 {
 		switch r.URL.RawQuery {
 		case "tar":
-			h.tar(w, r, pageData)
+			h.tar(w, r, data)
 			return
 		case "tgz":
-			h.tgz(w, r, pageData)
+			h.tgz(w, r, data)
 			return
 		case "zip":
-			h.zip(w, r, pageData)
+			h.zip(w, r, data)
 			return
 		}
 	}
 
-	item := pageData.Item
+	item := data.Item
 	if file != nil && item != nil && !item.IsDir() {
 		http.ServeContent(w, r, item.Name(), item.ModTime(), file)
 		return
@@ -109,7 +109,7 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	} else {
 		w.WriteHeader(http.StatusOK)
 	}
-	err := h.template.Execute(w, pageData)
+	err := h.template.Execute(w, data)
 	h.errHandler.LogError(err)
 }
 

src/serverHandler/pageData.go renamed to src/serverHandler/responseData.go

@@ -15,7 +15,7 @@ type pathEntry struct {
 	Path string
 }
 
-type pageData struct {
+type responseData struct {
 	rawReqPath     string
 	handlerReqPath string
 
@@ -294,7 +294,7 @@ func (h *handler) getCanCors(rawReqPath, reqFsPath string) bool {
 	return hasUrlOrDirPrefix(h.corsUrls, rawReqPath, h.corsDirs, reqFsPath)
 }
 
-func (h *handler) getPageData(r *http.Request) (data *pageData, notFound, internalError bool) {
+func (h *handler) getResponseData(r *http.Request) (data *responseData, notFound, internalError bool) {
 	requestUri := r.URL.Path
 	tailSlash := requestUri[len(requestUri)-1] == '/'
 
@@ -343,7 +343,7 @@ func (h *handler) getPageData(r *http.Request) (data *pageData, notFound, intern
 	canArchive := h.getCanArchive(subItems, rawReqPath, reqFsPath)
 	canCors := h.getCanCors(rawReqPath, reqFsPath)
 
-	data = &pageData{
+	data = &responseData{
 		rawReqPath:     rawReqPath,
 		handlerReqPath: reqPath,