refactor(serverHandler/archive): refine codes

Author: marjune163

src/serverHandler/archive.go

@@ -11,7 +11,7 @@ import (
 
 func (h *handler) visitFs(
 	initFsPath, rawRequestPath, relPath string,
-	callback func(*os.File, os.FileInfo, string),
+	callback func(*os.File, os.FileInfo, string) error,
 ) {
 	aliasedFsPath, hasAlias := h.aliases[rawRequestPath]
 
@@ -39,7 +39,9 @@ func (h *handler) visitFs(
 	}
 
 	if len(relPath) > 0 {
-		callback(f, fInfo, relPath)
+		if callback(f, fInfo, relPath) != nil {
+			return
+		}
 	}
 
 	if fInfo.IsDir() {

src/serverHandler/archiveTar.go

@@ -6,7 +6,7 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"runtime"
+	"path"
 )
 
 func writeTar(tw *tar.Writer, f *os.File, fInfo os.FileInfo, archivePath string) error {
@@ -36,7 +36,7 @@ func writeTar(tw *tar.Writer, f *os.File, fInfo os.FileInfo, archivePath string)
 		return err
 	}
 
-	if size == 0 || f == nil {
+	if size == 0 || f == nil || fInfo.IsDir() {
 		return nil
 	}
 
@@ -63,15 +63,14 @@ func (h *handler) tar(w http.ResponseWriter, r *http.Request, pageData *response
 	}
 
 	h.visitFs(
-		h.root+pageData.handlerReqPath,
+		path.Clean(h.root+pageData.handlerReqPath),
 		pageData.rawReqPath,
 		"",
-		func(f *os.File, fInfo os.FileInfo, relPath string) {
+		func(f *os.File, fInfo os.FileInfo, relPath string) (err error) {
 			go h.logArchive(filename, relPath, r)
-			err := writeTar(tw, f, fInfo, relPath)
-			if h.errHandler.LogError(err) {
-				runtime.Goexit()
-			}
+			err = writeTar(tw, f, fInfo, relPath)
+			h.errHandler.LogError(err)
+			return
 		},
 	)
 }
@@ -100,15 +99,14 @@ func (h *handler) tgz(w http.ResponseWriter, r *http.Request, pageData *response
 	}
 
 	h.visitFs(
-		h.root+pageData.handlerReqPath,
+		path.Clean(h.root+pageData.handlerReqPath),
 		pageData.rawReqPath,
 		"",
-		func(f *os.File, fInfo os.FileInfo, relPath string) {
+		func(f *os.File, fInfo os.FileInfo, relPath string) (err error) {
 			go h.logArchive(filename, relPath, r)
-			err := writeTar(tw, f, fInfo, relPath)
-			if h.errHandler.LogError(err) {
-				runtime.Goexit()
-			}
+			err = writeTar(tw, f, fInfo, relPath)
+			h.errHandler.LogError(err)
+			return
 		},
 	)
 }

src/serverHandler/archiveZip.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"runtime"
+	"path"
 )
 
 func writeZip(zw *zip.Writer, f *os.File, fInfo os.FileInfo, archivePath string) error {
@@ -26,7 +26,7 @@ func writeZip(zw *zip.Writer, f *os.File, fInfo os.FileInfo, archivePath string)
 		return err
 	}
 
-	if size == 0 || f == nil {
+	if size == 0 || f == nil || fInfo.IsDir() {
 		return nil
 	}
 
@@ -53,15 +53,14 @@ func (h *handler) zip(w http.ResponseWriter, r *http.Request, pageData *response
 	}
 
 	h.visitFs(
-		h.root+pageData.handlerReqPath,
+		path.Clean(h.root+pageData.handlerReqPath),
 		pageData.rawReqPath,
 		"",
-		func(f *os.File, fInfo os.FileInfo, relPath string) {
+		func(f *os.File, fInfo os.FileInfo, relPath string) (err error) {
 			go h.logArchive(filename, relPath, r)
-			err := writeZip(zipWriter, f, fInfo, relPath)
-			if h.errHandler.LogError(err) {
-				runtime.Goexit()
-			}
+			err = writeZip(zipWriter, f, fInfo, relPath)
+			h.errHandler.LogError(err)
+			return
 		},
 	)
 }