From d0dbdd359109434e68fdd941280b0f84b9c6d161 Mon Sep 17 00:00:00 2001 From: Remco Date: Wed, 22 Mar 2017 22:25:42 +0100 Subject: [PATCH] Fix linting errors --- server/handlers.go | 10 +++++----- server/server.go | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/server/handlers.go b/server/handlers.go index 84d1542..6242f17 100644 --- a/server/handlers.go +++ b/server/handlers.go @@ -60,8 +60,8 @@ import ( ) var ( - html_templates = initHTMLTemplates() - text_templates = initTextTemplates() + htmlTemplates = initHTMLTemplates() + textTemplates = initTextTemplates() ) func stripPrefix(path string) string { @@ -160,7 +160,7 @@ func (s *Server) previewHandler(w http.ResponseWriter, r *http.Request) { contentLength, } - if err := html_templates.ExecuteTemplate(w, templatePath, data); err != nil { + if err := htmlTemplates.ExecuteTemplate(w, templatePath, data); err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } @@ -174,12 +174,12 @@ func (s *Server) viewHandler(w http.ResponseWriter, r *http.Request) { // vars := mux.Vars(r) if acceptsHTML(r.Header) { - if err := html_templates.ExecuteTemplate(w, "index.html", nil); err != nil { + if err := htmlTemplates.ExecuteTemplate(w, "index.html", nil); err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } } else { - if err := text_templates.ExecuteTemplate(w, "index.txt", nil); err != nil { + if err := textTemplates.ExecuteTemplate(w, "index.txt", nil); err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } diff --git a/server/server.go b/server/server.go index 99047c5..3ef2203 100644 --- a/server/server.go +++ b/server/server.go @@ -220,8 +220,8 @@ func (s *Server) Run() { fs = http.Dir(s.webPath) - html_templates, _ = html_templates.ParseGlob(s.webPath + "*.html") - text_templates, _ = text_templates.ParseGlob(s.webPath + "*.txt") + htmlTemplates, _ = htmlTemplates.ParseGlob(s.webPath + "*.html") + textTemplates, _ = textTemplates.ParseGlob(s.webPath + "*.txt") } else { fs = &assetfs.AssetFS{ Asset: web.Asset, @@ -238,8 +238,8 @@ func (s *Server) Run() { log.Panicf("Unable to parse: path=%s, err=%s", path, err) } - html_templates.New(stripPrefix(path)).Parse(string(bytes)) - text_templates.New(stripPrefix(path)).Parse(string(bytes)) + htmlTemplates.New(stripPrefix(path)).Parse(string(bytes)) + textTemplates.New(stripPrefix(path)).Parse(string(bytes)) } }