Diffstat (limited to 'internal/templatemanager')
| -rw-r--r-- | internal/templatemanager/templatemanager.go | 90 |
1 files changed, 11 insertions, 79 deletions
diff --git a/internal/templatemanager/templatemanager.go b/internal/templatemanager/templatemanager.go index ff1214a..eebc297 100644 --- a/internal/templatemanager/templatemanager.go +++ b/internal/templatemanager/templatemanager.go @@ -4,12 +4,8 @@ import ( "bytes" "fmt" "html/template" - "os" "path/filepath" "strings" - "time" - - "github.com/SayaAndy/saya-today-web/l10n" ) type TemplateManager struct { @@ -17,9 +13,8 @@ type TemplateManager struct { } type templateManagerRender struct { - Main string - Tmpl *template.Template - LastModified time.Time + Main string + Tmpl *template.Template } type TemplateManagerTemplates struct { @@ -36,14 +31,6 @@ var templateFuncMap = template.FuncMap{ } return items }, - "replace": strings.ReplaceAll, - "fdiv": func(a, b int) float64 { - return float64(a) / float64(b) - }, - "l": func(path ...any) any { - return l10n.T.GetPath(path...) - }, - "join": strings.Join, } func NewTemplateManager(templates ...TemplateManagerTemplates) (*TemplateManager, error) { @@ -51,26 +38,13 @@ func NewTemplateManager(templates ...TemplateManagerTemplates) (*TemplateManager for _, tmplStruct := range templates { tmpl := template.New(tmplStruct.Name).Funcs(templateFuncMap) - if len(tmplStruct.Files) == 0 { - templateMap[tmplStruct.Name] = templateManagerRender{ - Main: "", - Tmpl: tmpl, - } - continue - } tmpl, err := tmpl.ParseFiles(tmplStruct.Files...) if err != nil { return nil, err } - modTime, err := setLastModified(tmplStruct.Files...) - if err != nil { - return nil, err - } - templateMap[tmplStruct.Name] = templateManagerRender{ - Main: filepath.Base(tmplStruct.Files[0]), - Tmpl: tmpl, - LastModified: modTime, + Main: filepath.Base(tmplStruct.Files[0]), + Tmpl: tmpl, } } @@ -82,16 +56,12 @@ func NewTemplateManager(templates ...TemplateManagerTemplates) (*TemplateManager func (tm *TemplateManager) Render(name string, data any, files ...string) ([]byte, error) { tmpl, exists := tm.templates[name] if !exists { - return nil, fmt.Errorf("template %s not found", name) + return nil, fmt.Errorf("template %s is not found", name) } var err error var tempTmpl *template.Template - var mainTmpl string = tmpl.Main if len(files) == 0 { - if mainTmpl == "" { - return []byte{}, nil - } tempTmpl = tmpl.Tmpl } else { tempTmpl, err = tmpl.Tmpl.Clone() @@ -102,66 +72,28 @@ func (tm *TemplateManager) Render(name string, data any, files ...string) ([]byt if err != nil { return nil, fmt.Errorf("couldn't include additional files in template rendering: %w", err) } - if mainTmpl == "" { - mainTmpl = filepath.Base(files[0]) - } } var buf bytes.Buffer - err = tempTmpl.ExecuteTemplate(&buf, mainTmpl, data) + err = tempTmpl.ExecuteTemplate(&buf, tmpl.Main, data) return buf.Bytes(), err } func (tm *TemplateManager) Add(name string, files ...string) error { - tmpl := template.New(name).Funcs(templateFuncMap) - if len(files) == 0 { - tm.templates[name] = templateManagerRender{ - Main: "", - Tmpl: tmpl, - } - return nil + return fmt.Errorf("you can't add template without any files") } - tmpl, err := tmpl.ParseFiles(files...) - if err != nil { - return fmt.Errorf("failed to add template into manager: %w", err) - } + tmpl := template.New(name).Funcs(templateFuncMap) - modTime, err := setLastModified(files...) + tmpl, err := tmpl.ParseFiles(files...) if err != nil { return fmt.Errorf("failed to add template into manager: %w", err) } tm.templates[name] = templateManagerRender{ - Main: filepath.Base(files[0]), - Tmpl: tmpl, - LastModified: modTime, + Main: filepath.Base(files[0]), + Tmpl: tmpl, } - return nil } - -func (tm *TemplateManager) GetLastModified(name string) (time.Time, error) { - tmpl, exists := tm.templates[name] - if !exists { - return time.Time{}, fmt.Errorf("template %s not found", name) - } - - return tmpl.LastModified, nil -} - -func setLastModified(filenames ...string) (time.Time, error) { - lastModified := time.Time{} - for _, filename := range filenames { - stat, err := os.Stat(filename) - if err != nil { - return lastModified, fmt.Errorf("failed to stat file: path '%s': %w", filename, err) - } - modTime := stat.ModTime() - if lastModified.Before(modTime) { - lastModified = modTime - } - } - return lastModified, nil -} |