oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-06 17:41:00 +00:00
Code Wiki Activity

Revert "perf(template): use ParseFS to directly parse the embedded template data"

Browse source 
This reverts commit 4336a0bd85.
This commit is contained in:
Frédéric Guillot 2025-07-22 21:25:33 -07:00
parent 1d1162327e
commit 20825a92c5
2 changed files with 9 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
internal/template/engine.go
View file

@ -55,6 +55,7 @@ func (e *Engine) ParseTemplates() error {
}
commonTemplateContents.Write(fileData)
}
dirEntries, err = viewTemplateFiles.ReadDir("templates/views")
if err != nil {
return err
@ -85,10 +86,15 @@ func (e *Engine) ParseTemplates() error {
for _, dirEntry := range dirEntries {
templateName := dirEntry.Name()
fileData, err := standaloneTemplateFiles.ReadFile("templates/standalone/" + dirEntry.Name())
if err != nil {
return err
}
slog.Debug("Parsing template",
slog.String("template_name", templateName),
)
e.templates[templateName] = template.Must(template.New("base").Funcs(e.funcMap.Map()).ParseFS(standaloneTemplateFiles, "templates/standalone/"+dirEntry.Name()))
e.templates[templateName] = template.Must(template.New("base").Funcs(e.funcMap.Map()).Parse(string(fileData)))
}
return nil
@ -113,7 +119,8 @@ func (e *Engine) Render(name string, data map[string]any) []byte {
})
var b bytes.Buffer
if err := tpl.ExecuteTemplate(&b, "base", data); err != nil {
err := tpl.ExecuteTemplate(&b, "base", data)
if err != nil {
panic(err)
}

14
internal/template/engine_test.go
View file

@ -1,14 +0,0 @@
// SPDX-FileCopyrightText: Copyright The Miniflux Authors. All rights reserved.
// SPDX-License-Identifier: Apache-2.0
package template // import "miniflux.app/v2/internal/template"
import (
"testing"
)
func TestParseTemplates(t *testing.T) {
if err := NewEngine(nil).ParseTemplates(); err != nil {
t.Fatal(err)
}
}