refactor(serverHandler/archive): extract archive func

Author: marjune163

src/serverHandler/archive.go

@@ -9,9 +9,11 @@ import (
 	"strings"
 )
 
+type archiveCallback func(f *os.File, fInfo os.FileInfo, relPath string) error
+
 func (h *handler) visitFs(
 	initFsPath, rawRequestPath, relPath string,
-	callback func(*os.File, os.FileInfo, string) error,
+	callback archiveCallback,
 ) {
 	aliasedFsPath, hasAlias := h.aliases[rawRequestPath]
 
@@ -95,6 +97,34 @@ func (h *handler) visitFs(
 	}
 }
 
+func (h *handler) archive(
+	w http.ResponseWriter,
+	r *http.Request,
+	pageData *responseData,
+	fileSuffix string,
+	contentType string,
+	cbWriteFile archiveCallback,
+) {
+	targetFilename := pageData.ItemName + fileSuffix
+	writeArchiveHeader(w, contentType, targetFilename)
+
+	if !needResponseBody(r.Method) {
+		return
+	}
+
+	h.visitFs(
+		path.Clean(h.root+pageData.handlerReqPath),
+		pageData.rawReqPath,
+		"",
+		func(f *os.File, fInfo os.FileInfo, relPath string) error {
+			go h.logArchive(targetFilename, relPath, r)
+			err := cbWriteFile(f, fInfo, relPath)
+			h.errHandler.LogError(err)
+			return err
+		},
+	)
+}
+
 func writeArchiveHeader(w http.ResponseWriter, contentType, filename string) {
 	filename = url.PathEscape(filename)
 

src/serverHandler/archiveTar.go

@@ -6,7 +6,6 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"path"
 )
 
 func writeTar(tw *tar.Writer, f *os.File, fInfo os.FileInfo, archivePath string) error {
@@ -55,22 +54,14 @@ func (h *handler) tar(w http.ResponseWriter, r *http.Request, pageData *response
 		h.errHandler.LogError(err)
 	}()
 
-	filename := pageData.ItemName + ".tar"
-	writeArchiveHeader(w, "application/octet-stream", filename)
-
-	if !needResponseBody(r.Method) {
-		return
-	}
-
-	h.visitFs(
-		path.Clean(h.root+pageData.handlerReqPath),
-		pageData.rawReqPath,
-		"",
-		func(f *os.File, fInfo os.FileInfo, relPath string) (err error) {
-			go h.logArchive(filename, relPath, r)
-			err = writeTar(tw, f, fInfo, relPath)
-			h.errHandler.LogError(err)
-			return
+	h.archive(
+		w,
+		r,
+		pageData,
+		".tar",
+		"application/octet-stream",
+		func(f *os.File, fInfo os.FileInfo, relPath string) error {
+			return writeTar(tw, f, fInfo, relPath)
 		},
 	)
 }
@@ -91,22 +82,14 @@ func (h *handler) tgz(w http.ResponseWriter, r *http.Request, pageData *response
 		h.errHandler.LogError(err)
 	}()
 
-	filename := pageData.ItemName + ".tar.gz"
-	writeArchiveHeader(w, "application/octet-stream", filename)
-
-	if !needResponseBody(r.Method) {
-		return
-	}
-
-	h.visitFs(
-		path.Clean(h.root+pageData.handlerReqPath),
-		pageData.rawReqPath,
-		"",
-		func(f *os.File, fInfo os.FileInfo, relPath string) (err error) {
-			go h.logArchive(filename, relPath, r)
-			err = writeTar(tw, f, fInfo, relPath)
-			h.errHandler.LogError(err)
-			return
+	h.archive(
+		w,
+		r,
+		pageData,
+		".tar.gz",
+		"application/octet-stream",
+		func(f *os.File, fInfo os.FileInfo, relPath string) error {
+			return writeTar(tw, f, fInfo, relPath)
 		},
 	)
 }

src/serverHandler/archiveZip.go

@@ -5,7 +5,6 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"path"
 )
 
 func writeZip(zw *zip.Writer, f *os.File, fInfo os.FileInfo, archivePath string) error {
@@ -45,22 +44,14 @@ func (h *handler) zip(w http.ResponseWriter, r *http.Request, pageData *response
 		h.errHandler.LogError(err)
 	}()
 
-	filename := pageData.ItemName + ".zip"
-	writeArchiveHeader(w, "application/zip", filename)
-
-	if !needResponseBody(r.Method) {
-		return
-	}
-
-	h.visitFs(
-		path.Clean(h.root+pageData.handlerReqPath),
-		pageData.rawReqPath,
-		"",
-		func(f *os.File, fInfo os.FileInfo, relPath string) (err error) {
-			go h.logArchive(filename, relPath, r)
-			err = writeZip(zipWriter, f, fInfo, relPath)
-			h.errHandler.LogError(err)
-			return
+	h.archive(
+		w,
+		r,
+		pageData,
+		".zip",
+		"application/zip",
+		func(f *os.File, fInfo os.FileInfo, relPath string) error {
+			return writeZip(zipWriter, f, fInfo, relPath)
 		},
 	)
 }