diff options
| author | René 'Necoro' Neumann <necoro@necoro.eu> | 2020-04-21 18:48:06 +0200 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.eu> | 2020-04-21 18:48:06 +0200 |
| commit | 1845873048e1f2c3499e75a4e5cbbe8d1247170d (patch) | |
| tree | aa2968d2ead185c440957d9d3ed2cfb54abf6ce8 /internal | |
| parent | 87935efe945c6847d2b18afaf7bfae5e80aa61e6 (diff) | |
| download | feed2imap-go-1845873048e1f2c3499e75a4e5cbbe8d1247170d.tar.gz feed2imap-go-1845873048e1f2c3499e75a4e5cbbe8d1247170d.tar.bz2 feed2imap-go-1845873048e1f2c3499e75a4e5cbbe8d1247170d.zip | |
Move HTML template to string
Diffstat (limited to '')
| -rw-r--r-- | internal/feed/mail.go | 4 | ||||
| -rw-r--r-- | internal/template/feed.tpl.go (renamed from internal/feed/feed.tpl) | 15 | ||||
| -rw-r--r-- | internal/template/template.go | 6 |
3 files changed, 13 insertions, 12 deletions
diff --git a/internal/feed/mail.go b/internal/feed/mail.go index 4d07c1a..94f2ea1 100644 --- a/internal/feed/mail.go +++ b/internal/feed/mail.go @@ -31,10 +31,8 @@ func fromAdress(feed *Feed, item feeditem, cfg config.Config) []*mail.Address { } } -var htmlTemplate = template.ForFile("internal/feed/feed.tpl") - func writeHtml(writer io.Writer, item feeditem) error { - return htmlTemplate.Execute(writer, item) + return template.Feed.Execute(writer, item) } func writeToBuffer(b *bytes.Buffer, feed *Feed, item feeditem, cfg config.Config) error { diff --git a/internal/feed/feed.tpl b/internal/template/feed.tpl.go index 650176e..f6862d5 100644 --- a/internal/feed/feed.tpl +++ b/internal/template/feed.tpl.go @@ -1,4 +1,9 @@ -{{- /*gotype:github.com/Necoro/feed2imap-go/internal/feed.feeditem*/ -}} +package template + +var Feed = fromString("Feed", feedTpl) + +//noinspection HtmlDeprecatedAttribute,HtmlUnknownTarget +const feedTpl = `{{- /*gotype:github.com/Necoro/feed2imap-go/internal/feed.feeditem*/ -}} {{define "bottomLine"}} {{if .content}} <tr> @@ -11,7 +16,7 @@ </tr> {{end}} {{end}} -<table border="1" width="100%" cellpadding="0" cellspacing="0" borderspacing="0"> +<table border="1" width="100%" cellpadding="0" cellspacing="0" style="border-spacing: 0; "> <tr> <td> <table width="100%" bgcolor="#EDEDED" cellpadding="4" cellspacing="2"> @@ -36,11 +41,11 @@ </tr> </table> {{with .Item.Content}} - <br /> <!-- originally: only if content and `content !~ /\A\s*</m` --> + <br /> <!-- originally: only if content and 'content !~ /\A\s*</m' --> {{.}} {{end}} {{with .Item.Enclosures}} - <table border="1" width="100%" cellpadding="0" cellspacing="0" borderspacing="0"> + <table border="1" width="100%" cellpadding="0" cellspacing="0" style="border-spacing: 0; "> <tr> <td> <table width="100%" bgcolor="#EDEDED" cellpadding="2" cellspacing="2"> @@ -64,4 +69,4 @@ {{template "bottomLine" (dict "descr" "Author:" "content" .Item.Author.Name)}} {{template "bottomLine" (dict "descr" "Subject:" "content" .Item.Title)}} {{template "bottomLine" (dict "descr" "Filed under:" "content" (join ", " .Item.Categories))}} -</table>
\ No newline at end of file +</table>` diff --git a/internal/template/template.go b/internal/template/template.go index e31ece2..350a0ed 100644 --- a/internal/template/template.go +++ b/internal/template/template.go @@ -3,7 +3,6 @@ package template import ( "fmt" "html/template" - "path/filepath" "strings" ) @@ -50,8 +49,7 @@ var funcMap = template.FuncMap{ "byteCount": byteCount, } -func ForFile(filename string) *template.Template { - name := filepath.Base(filename) +func fromString(name, templateStr string) *template.Template { tpl := template.New(name).Funcs(funcMap) - return template.Must(tpl.ParseFiles(filename)) + return template.Must(tpl.Parse(templateStr)) } |