Diffstat (limited to 'internal/templatemanager')
| -rw-r--r-- | internal/templatemanager/templatemanager.go | 56 |
1 files changed, 7 insertions, 49 deletions
diff --git a/internal/templatemanager/templatemanager.go b/internal/templatemanager/templatemanager.go index eebc297..5effcb3 100644 --- a/internal/templatemanager/templatemanager.go +++ b/internal/templatemanager/templatemanager.go @@ -22,22 +22,13 @@ type TemplateManagerTemplates struct { Files []string } -var templateFuncMap = template.FuncMap{ - "contains": strings.Contains, - "iterate": func(count uint) []uint { - items := make([]uint, count) - for i := range count { - items[i] = i - } - return items - }, -} - -func NewTemplateManager(templates ...TemplateManagerTemplates) (*TemplateManager, error) { +func NewTemplateManager(templates []TemplateManagerTemplates) (*TemplateManager, error) { templateMap := make(map[string]templateManagerRender) for _, tmplStruct := range templates { - tmpl := template.New(tmplStruct.Name).Funcs(templateFuncMap) + tmpl := template.New("").Funcs(template.FuncMap{ + "contains": strings.Contains, + }) tmpl, err := tmpl.ParseFiles(tmplStruct.Files...) if err != nil { return nil, err @@ -46,6 +37,7 @@ func NewTemplateManager(templates ...TemplateManagerTemplates) (*TemplateManager Main: filepath.Base(tmplStruct.Files[0]), Tmpl: tmpl, } + } return &TemplateManager{ @@ -53,47 +45,13 @@ func NewTemplateManager(templates ...TemplateManagerTemplates) (*TemplateManager }, nil } -func (tm *TemplateManager) Render(name string, data any, files ...string) ([]byte, error) { +func (tm *TemplateManager) Render(name string, data interface{}) ([]byte, error) { tmpl, exists := tm.templates[name] if !exists { return nil, fmt.Errorf("template %s is not found", name) } - var err error - var tempTmpl *template.Template - if len(files) == 0 { - tempTmpl = tmpl.Tmpl - } else { - tempTmpl, err = tmpl.Tmpl.Clone() - if err != nil { - return nil, fmt.Errorf("couldn't clone existing template for rendering: %w", err) - } - tempTmpl, err = tempTmpl.ParseFiles(files...) - if err != nil { - return nil, fmt.Errorf("couldn't include additional files in template rendering: %w", err) - } - } - var buf bytes.Buffer - err = tempTmpl.ExecuteTemplate(&buf, tmpl.Main, data) + err := tmpl.Tmpl.ExecuteTemplate(&buf, tmpl.Main, data) return buf.Bytes(), err } - -func (tm *TemplateManager) Add(name string, files ...string) error { - if len(files) == 0 { - return fmt.Errorf("you can't add template without any files") - } - - tmpl := template.New(name).Funcs(templateFuncMap) - - 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, - } - return nil -} |