dkforest

commit 4894911b7c34725405340963e2d4334f0d9983fe
parent 31e280d835a20febfcfae667fd99b20f9c00716e
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Tue, 30 May 2023 07:58:32 -0700

simplify code

Diffstat:
M
pkg/template/templates.go
 | 
12
++----------

1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/pkg/template/templates.go b/pkg/template/templates.go
@@ -16,7 +16,6 @@ import (
 	"dkforest/pkg/utils"
 	"github.com/labstack/echo"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
-	"github.com/sirupsen/logrus"
 )
 
 // Templates ...
@@ -142,10 +141,7 @@ func buildTemplatesHelper(root string, tmpls map[string]*template.Template, pref
 		page = strings.TrimSuffix(page, ".gohtml")
 		tmpl := New("_", bindata.Asset).Funcs(fnsMap)
 		parseBases(tmpl, bases)
-		tmpl, err := tmpl.Parse(root + prefix + "/" + page + ext)
-		if err != nil {
-			logrus.Error(root+prefix+"/"+page+ext, err)
-		}
+		tmpl = Must(tmpl.Parse(root + prefix + "/" + page + ext))
 		tmplName := buildTemplateName(prefix, page)
 		tmpls[tmplName] = tmpl.Tmpl
 	}
@@ -159,11 +155,7 @@ func buildTemplateName(prefix, page string) string {
 }
 
 func parseBases(tmpl *Template, bases []string) {
-	var err error
 	for _, b := range bases {
-		tmpl, err = tmpl.Parse(b)
-		if err != nil {
-			logrus.Error(err)
-		}
+		tmpl = Must(tmpl.Parse(b))
 	}
 }