nhyatt/istheinternetonfire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reduce code smells

Browse Source
This commit is contained in:
Hyatt 2024-02-10 08:15:57 -06:00
parent 5999180246
commit 2473942c7c
Signed by: nhyatt
GPG Key ID: C50D0BBB5BC40BEA
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
internal/webserver/httpTemplate.go
View File

@ -14,6 +14,11 @@ import (
"istheinternetonfire.app/internal/config" "istheinternetonfire.app/internal/config"
) )
const (
ERR_PARSE_TEMPLATE = "Template Parse Error"
ERR_EXEC_TEMPLATE = "Template Execution Error"
)
type webErrStruct struct { type webErrStruct struct {
Error bool `json:"error" yaml:"error"` Error bool `json:"error" yaml:"error"`
ErrorMsg string `json:"error_message" yaml:"errorMessage"` ErrorMsg string `json:"error_message" yaml:"errorMessage"`
@ -47,8 +52,8 @@ func tmpltWebRoot(w http.ResponseWriter, r *http.Request) {
"html/css/style.css", "html/css/style.css",
) )
if err != nil { if err != nil {
config.Cfg.Log.Debug("unable to parse html template", "error", err) config.Cfg.Log.Debug(ERR_PARSE_TEMPLATE, "error", err)
tmpltError(w, http.StatusInternalServerError, "Template Parse Error.") tmpltError(w, http.StatusInternalServerError, ERR_PARSE_TEMPLATE)
return return
} }
@ -75,8 +80,8 @@ func tmpltWebRoot(w http.ResponseWriter, r *http.Request) {
}{ }{
CVEs: cves[len(cves)-num:], CVEs: cves[len(cves)-num:],
}); err != nil { }); err != nil {
config.Cfg.Log.Debug("unable to execute html template", err) config.Cfg.Log.Debug(ERR_EXEC_TEMPLATE, "error", err)
tmpltError(w, http.StatusInternalServerError, "Template Parse Error.") tmpltError(w, http.StatusInternalServerError, ERR_PARSE_TEMPLATE)
return return
} }
@ -86,8 +91,8 @@ func tmpltWebRoot(w http.ResponseWriter, r *http.Request) {
func tmpltStatusNotFound(w http.ResponseWriter, path string) { func tmpltStatusNotFound(w http.ResponseWriter, path string) {
tmplt, err := template.ParseFS(assets.EmbedHTML, "html/file-not-found.tplt") tmplt, err := template.ParseFS(assets.EmbedHTML, "html/file-not-found.tplt")
if err != nil { if err != nil {
config.Cfg.Log.Debug("unable to parse html template", err) config.Cfg.Log.Debug(ERR_PARSE_TEMPLATE, "error", err)
tmpltError(w, http.StatusInternalServerError, "Template Parse Error.") tmpltError(w, http.StatusInternalServerError, ERR_PARSE_TEMPLATE)
return return
} }
@ -99,8 +104,8 @@ func tmpltStatusNotFound(w http.ResponseWriter, path string) {
Title: path, Title: path,
ErrorCode: http.StatusNotFound, ErrorCode: http.StatusNotFound,
}); err != nil { }); err != nil {
config.Cfg.Log.Debug("unable to execute html template", err) config.Cfg.Log.Debug(ERR_EXEC_TEMPLATE, "error", err)
tmpltError(w, http.StatusInternalServerError, "Template Parse Error.") tmpltError(w, http.StatusInternalServerError, ERR_PARSE_TEMPLATE)
return return
} }
w.Write(msgBuffer.Bytes()) //nolint:errcheck w.Write(msgBuffer.Bytes()) //nolint:errcheck
@ -114,8 +119,8 @@ func tmpltTXT(w http.ResponseWriter) {
"html/site.txt.tplt", "html/site.txt.tplt",
) )
if err != nil { if err != nil {
config.Cfg.Log.Debug("unable to parse template", "error", err) config.Cfg.Log.Debug(ERR_PARSE_TEMPLATE, "error", err)
tmpltError(w, http.StatusInternalServerError, "Template Parse Error.") tmpltError(w, http.StatusInternalServerError, ERR_PARSE_TEMPLATE)
return return
} }
@ -142,8 +147,8 @@ func tmpltTXT(w http.ResponseWriter) {
}{ }{
CVEs: cves[len(cves)-num:], CVEs: cves[len(cves)-num:],
}); err != nil { }); err != nil {
config.Cfg.Log.Debug("unable to execute html template", err) config.Cfg.Log.Debug(ERR_EXEC_TEMPLATE, "error", err)
tmpltError(w, http.StatusInternalServerError, "Template Parse Error.") tmpltError(w, http.StatusInternalServerError, ERR_PARSE_TEMPLATE)
return return
} }