From 1845873048e1f2c3499e75a4e5cbbe8d1247170d Mon Sep 17 00:00:00 2001 From: RenĂ© 'Necoro' Neumann Date: Tue, 21 Apr 2020 18:48:06 +0200 Subject: Move HTML template to string --- internal/feed/feed.tpl | 67 ---------------------------------------- internal/feed/mail.go | 4 +-- internal/template/feed.tpl.go | 72 +++++++++++++++++++++++++++++++++++++++++++ internal/template/template.go | 6 ++-- 4 files changed, 75 insertions(+), 74 deletions(-) delete mode 100644 internal/feed/feed.tpl create mode 100644 internal/template/feed.tpl.go diff --git a/internal/feed/feed.tpl b/internal/feed/feed.tpl deleted file mode 100644 index 650176e..0000000 --- a/internal/feed/feed.tpl +++ /dev/null @@ -1,67 +0,0 @@ -{{- /*gotype:github.com/Necoro/feed2imap-go/internal/feed.feeditem*/ -}} -{{define "bottomLine"}} - {{if .content}} - - - {{.descr}}   - - - {{.content}} - - - {{end}} -{{end}} - - - - -
- - - - - - - - - -
Feed - {{with .Feed.Link}}{{end}} - {{or .Feed.Title .Feed.Link "Unnammed feed"}} - {{if .Feed.Link}}{{end}} -
Item - {{with .Item.Link}}{{end}} - {{or .Item.Title .Item.Link}} - {{if .Item.Link}}{{end}} -
-
-{{with .Item.Content}} -
- {{.}} -{{end}} -{{with .Item.Enclosures}} - - - - -
- - - {{range .}} - - - - {{end}} -
Files:
-     - {{.URL | lastUrlPart}} ({{.Length | byteCount}}, {{.Type}}) -
-
-{{end}} -
- - {{template "bottomLine" (dict "descr" "Date:" "content" .Item.Published)}} - {{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))}} -
\ No newline at end of file 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/template/feed.tpl.go b/internal/template/feed.tpl.go new file mode 100644 index 0000000..f6862d5 --- /dev/null +++ b/internal/template/feed.tpl.go @@ -0,0 +1,72 @@ +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}} + + + {{.descr}}   + + + {{.content}} + + + {{end}} +{{end}} + + + + +
+ + + + + + + + + +
Feed + {{with .Feed.Link}}{{end}} + {{or .Feed.Title .Feed.Link "Unnammed feed"}} + {{if .Feed.Link}}{{end}} +
Item + {{with .Item.Link}}{{end}} + {{or .Item.Title .Item.Link}} + {{if .Item.Link}}{{end}} +
+
+{{with .Item.Content}} +
+ {{.}} +{{end}} +{{with .Item.Enclosures}} + + + + +
+ + + {{range .}} + + + + {{end}} +
Files:
+     + {{.URL | lastUrlPart}} ({{.Length | byteCount}}, {{.Type}}) +
+
+{{end}} +
+ + {{template "bottomLine" (dict "descr" "Date:" "content" .Item.Published)}} + {{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))}} +
` 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)) } -- cgit v1.2.3-54-g00ecf