From 7be1eec9fabd183675469bec4da42f429fefc121 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Tue, 6 Jul 2021 21:15:02 +0200 Subject: [PATCH] util: use assets from embeded FS --- ui/assets.go | 4 ++++ utils/mail.go | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ui/assets.go b/ui/assets.go index 1c9b390..6751bac 100644 --- a/ui/assets.go +++ b/ui/assets.go @@ -14,6 +14,10 @@ var _assets embed.FS var Assets http.FileSystem +func GetEmbedFS() embed.FS { + return _assets +} + func init() { sub, err := fs.Sub(_assets, "dist") if err != nil { diff --git a/utils/mail.go b/utils/mail.go index 8155788..c724eeb 100644 --- a/utils/mail.go +++ b/utils/mail.go @@ -35,9 +35,12 @@ import ( "bytes" "flag" "io" + "io/fs" "net/mail" "text/template" + "git.happydns.org/happydns/ui" + gomail "github.com/go-mail/mail" "github.com/yuin/goldmark" "github.com/yuin/goldmark/extension" @@ -135,7 +138,7 @@ func SendMail(to *mail.Address, subject, content string) (err error) { return } - if data, err := Asset("htdocs/dist/img/happydns.png"); err != nil { + if data, err := fs.ReadFile(ui.GetEmbedFS(), "dist/img/happydns.png"); err != nil { m.EmbedReader("happydns.png", bytes.NewReader(data)) }