refactor(serverHandler): extract page rendering func

Author: marjune163

src/serverHandler/main.go

@@ -50,7 +50,7 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	data, notFound, internalError := h.getResponseData(r)
+	data := h.getResponseData(r)
 	if len(data.Errors) > 0 {
 		go func() {
 			for _, err := range data.Errors {
@@ -99,18 +99,7 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	header := w.Header()
-	header.Set("Content-Type", "text/html; charset=utf-8")
-	header.Set("Cache-Control", "public, max-age=0")
-	if internalError {
-		w.WriteHeader(http.StatusInternalServerError)
-	} else if notFound {
-		w.WriteHeader(http.StatusNotFound)
-	} else {
-		w.WriteHeader(http.StatusOK)
-	}
-	err := h.template.Execute(w, data)
-	h.errHandler.LogError(err)
+	h.page(w, r, data)
 }
 
 func NewHandler(

src/serverHandler/page.go

@@ -0,0 +1,20 @@
+package serverHandler
+
+import "net/http"
+
+func (h *handler) page(w http.ResponseWriter, r *http.Request, data *responseData) {
+	header := w.Header()
+	header.Set("Content-Type", "text/html; charset=utf-8")
+	header.Set("Cache-Control", "public, max-age=0")
+
+	if data.hasInternalError {
+		w.WriteHeader(http.StatusInternalServerError)
+	} else if data.hasNotFoundError {
+		w.WriteHeader(http.StatusNotFound)
+	} else {
+		w.WriteHeader(http.StatusOK)
+	}
+
+	err := h.template.Execute(w, data)
+	h.errHandler.LogError(err)
+}

src/serverHandler/responseData.go

@@ -19,6 +19,9 @@ type responseData struct {
 	rawReqPath     string
 	handlerReqPath string
 
+	hasNotFoundError bool
+	hasInternalError bool
+
 	IsRoot        bool
 	Path          string
 	Paths         []*pathEntry
@@ -294,13 +297,15 @@ func (h *handler) getCanCors(rawReqPath, reqFsPath string) bool {
 	return hasUrlOrDirPrefix(h.corsUrls, rawReqPath, h.corsDirs, reqFsPath)
 }
 
-func (h *handler) getResponseData(r *http.Request) (data *responseData, notFound, internalError bool) {
+func (h *handler) getResponseData(r *http.Request) (data *responseData) {
 	requestUri := r.URL.Path
 	tailSlash := requestUri[len(requestUri)-1] == '/'
 
 	rawReqPath := util.CleanUrlPath(requestUri)
 	reqPath := util.CleanUrlPath(rawReqPath[len(h.urlPrefix):]) // strip url prefix path
 	errs := []error{}
+	notFound := false
+	internalError := false
 
 	isRoot := rawReqPath == "/"
 
@@ -347,6 +352,9 @@ func (h *handler) getResponseData(r *http.Request) (data *responseData, notFound
 		rawReqPath:     rawReqPath,
 		handlerReqPath: reqPath,
 
+		hasNotFoundError: notFound,
+		hasInternalError: internalError,
+
 		IsRoot:        isRoot,
 		Path:          rawReqPath,
 		Paths:         pathEntries,