From 20825a92c526abcfeff0d7b4a739b6e2ab54ae72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Tue, 22 Jul 2025 21:25:33 -0700 Subject: [PATCH] Revert "perf(template): use `ParseFS` to directly parse the embedded template data" This reverts commit 4336a0bd859a492c9c96ae3cfbff01f4b1718270. --- internal/template/engine.go | 11 +++++++++-- internal/template/engine_test.go | 14 -------------- 2 files changed, 9 insertions(+), 16 deletions(-) delete mode 100644 internal/template/engine_test.go diff --git a/internal/template/engine.go b/internal/template/engine.go index e4a3746b..a4fcdc7e 100644 --- a/internal/template/engine.go +++ b/internal/template/engine.go @@ -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) } diff --git a/internal/template/engine_test.go b/internal/template/engine_test.go deleted file mode 100644 index 6960595f..00000000 --- a/internal/template/engine_test.go +++ /dev/null @@ -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) - } -}