dkforest

commit 386cd69d42585636afe7d8bdcc084db96b70511d
parent 9c47282805f55fbc762f41d0645eecb26b769cb5
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Tue, 30 May 2023 07:05:15 -0700

cleanup

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

1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/pkg/template/templates.go b/pkg/template/templates.go
@@ -129,12 +129,9 @@ func buildTemplatesHelper(root string, tmpls map[string]*template.Template, pref
 		bases = append(bases, root+prefix+"/index.gohtml")
 	}
 	viewsPages, _ := bindata.AssetDir(root + prefix)
-LOOP:
 	for _, page := range viewsPages {
-		for _, base := range bases {
-			if root+prefix+"/"+page == base {
-				continue LOOP
-			}
+		if utils.InArr(root+prefix+"/"+page, bases) {
+			continue
 		}
 		ext := filepath.Ext(page)
 		if !strings.HasSuffix(page, ".gohtml") {
@@ -144,15 +141,8 @@ LOOP:
 
 		page = strings.TrimSuffix(page, ".gohtml")
 		tmpl := New("_", bindata.Asset).Funcs(fnsMap)
-
-		var err error
-		for _, b := range bases {
-			tmpl, err = tmpl.Parse(b)
-			if err != nil {
-				logrus.Error(err)
-			}
-		}
-		tmpl, err = tmpl.Parse(root + prefix + "/" + page + ext)
+		parseBases(tmpl, bases)
+		tmpl, err := tmpl.Parse(root + prefix + "/" + page + ext)
 		if err != nil {
 			logrus.Error(root+prefix+"/"+page+ext, err)
 		}
@@ -162,3 +152,13 @@ LOOP:
 		tmpls[tmplName] = tmpl.Tmpl
 	}
 }
+
+func parseBases(tmpl *Template, bases []string) {
+	var err error
+	for _, b := range bases {
+		tmpl, err = tmpl.Parse(b)
+		if err != nil {
+			logrus.Error(err)
+		}
+	}
+}