From e0444c96749d016b003443087481c67592a4893d Mon Sep 17 00:00:00 2001 From: Julian Hurst Date: Thu, 10 Aug 2023 17:01:19 +0200 Subject: Embed templates at compile time --- main.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index f2ab0c8..91d6fb7 100644 --- a/main.go +++ b/main.go @@ -19,6 +19,7 @@ import ( "crypto/rand" "crypto/cipher" "crypto/aes" + "embed" ) var store = b64decodeAndInitNonce(os.Getenv("SESSION_KEY")) @@ -32,6 +33,9 @@ const baseDocDir string = "docs" const NOTFOUND string = "Not found" const UNAUTH string = "Unauthorized" +//go:embed templates +var tmplContent embed.FS + type Doc struct { Name string Size string @@ -112,7 +116,8 @@ func serveTemplate(w http.ResponseWriter, r *http.Request, data interface{}, vie } views := []string {"templates/base.html", nav} views = append(views, view...) - t, err := template.New("base.html").Funcs(fmap).ParseFiles(views...) + //t, err := template.New("base.html").Funcs(fmap).ParseFiles(views...) + t, err := template.New("base.html").Funcs(fmap).ParseFS(tmplContent, views...) if err != nil { log.Fatal(err) } @@ -132,7 +137,7 @@ func serveSimple(w http.ResponseWriter, r *http.Request, data interface{}, view views := []string {view} views = append(views, xviews...) fp := filepath.Base(views[len(views)-1]) - t, err := template.New(fp).Funcs(fmap).ParseFiles(views...) + t, err := template.New(fp).Funcs(fmap).ParseFS(tmplContent, views...) if err != nil { log.Fatal(err) } -- cgit v1.2.3