commit 59673035ba96eead384408d7ff1d310ede333d82
parent d3e874a20b9bc16bbae7f198ae87f8acbc6a5a6d
Author: GeaRSiX <gearsix@tuta.io>
Date: Mon, 5 Jul 2021 22:20:28 +0100
minor tidy in LoadTemplateDir
Diffstat:
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/template.go b/template.go
@@ -34,13 +34,9 @@ func LoadTemplateDir(dir string) ([]suti.Template, error) {
paths[t] = make([]string, 0)
dir, file := filepath.Split(t)
ppath := filepath.Join(dir, strings.TrimSuffix(file, filepath.Ext(file)))
- if _, err := os.Stat(ppath); err == nil {
- var partials []string
- // TODO: calling loadPaths again is inefficient
- if partials, err = loadPaths(ppath); err != nil {
- return nil, err
- } else {
- paths[t] = partials
+ for _, p := range tpaths {
+ if strings.Contains(p, ppath) && p != t {
+ paths[t] = append(paths[t], p)
}
}
}