1f349/simplemail
4
0
Fork 0
mirror of https://github.com/1f349/simplemail.git synced 2024-12-21 15:44:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only accept single fs.FS for templates

Browse Source
This commit is contained in:
Melon 2024-09-21 18:39:05 +01:00
parent 04b8bb59b0
commit 109af2440d
Signed by: melon
GPG Key ID: 6C9D970C50D26A25
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
simplemail.go
View File

@ -2,15 +2,11 @@ package simplemail
import (
"bytes"
"errors"
"github.com/1f349/overlapfs"
"github.com/emersion/go-message/mail"
htmlTemplate "html/template"
"io"
"io/fs"
"log"
"os"
"path/filepath"
textTemplate "text/template"
)
@ -20,22 +16,13 @@ type SimpleMail struct {
textTemplates *textTemplate.Template
}
func New(sender *Mail, wd string, normal fs.FS) (simpleMail *SimpleMail, err error) {
func New(sender *Mail, templateFS fs.FS) (simpleMail *SimpleMail, err error) {
m := &SimpleMail{mailSender: sender}
if wd != "" {
mailDir := filepath.Join(wd, "mail-templates")
err = os.Mkdir(mailDir, os.ModePerm)
if err != nil && !errors.Is(err, os.ErrExist) {
return
}
wdFs := os.DirFS(mailDir)
normal = overlapfs.OverlapFS{A: normal, B: wdFs}
}
m.htmlTemplates, err = htmlTemplate.New("mail").ParseFS(normal, "*.go.html")
m.htmlTemplates, err = htmlTemplate.New("mail").ParseFS(templateFS, "*.go.html")
if err != nil {
return
}
m.textTemplates, err = textTemplate.New("mail").ParseFS(normal, "*.go.txt")
m.textTemplates, err = textTemplate.New("mail").ParseFS(templateFS, "*.go.txt")
if err != nil {
return
}