From 87935efe945c6847d2b18afaf7bfae5e80aa61e6 Mon Sep 17 00:00:00 2001 From: RenĂ© 'Necoro' Neumann Date: Tue, 21 Apr 2020 01:26:48 +0200 Subject: HTML Template part of the mail --- internal/feed/feed.tpl | 67 ++++++++++++++++++++++++++++++++++++++++++++++ internal/feed/mail.go | 72 ++++++++++++++++++++++++++++++++++++++++---------- internal/feed/parse.go | 4 +-- 3 files changed, 127 insertions(+), 16 deletions(-) create mode 100644 internal/feed/feed.tpl (limited to 'internal/feed') diff --git a/internal/feed/feed.tpl b/internal/feed/feed.tpl new file mode 100644 index 0000000..650176e --- /dev/null +++ b/internal/feed/feed.tpl @@ -0,0 +1,67 @@ +{{- /*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 05d095b..4d07c1a 100644 --- a/internal/feed/mail.go +++ b/internal/feed/mail.go @@ -2,19 +2,21 @@ package feed import ( "bytes" + "fmt" "io" "time" "github.com/emersion/go-message/mail" "github.com/Necoro/feed2imap-go/internal/config" + "github.com/Necoro/feed2imap-go/internal/template" ) func address(name, address string) []*mail.Address { return []*mail.Address{{Name: name, Address: address}} } -func fromAdress(feed Feed, item feeditem, cfg config.Config) []*mail.Address { +func fromAdress(feed *Feed, item feeditem, cfg config.Config) []*mail.Address { switch { case item.Item.Author != nil && item.Item.Author.Email != "": return address(item.Item.Author.Name, item.Item.Author.Email) @@ -29,9 +31,13 @@ func fromAdress(feed Feed, item feeditem, cfg config.Config) []*mail.Address { } } -func asMail(feed Feed, item feeditem, cfg config.Config) (string, error) { - var b bytes.Buffer +var htmlTemplate = template.ForFile("internal/feed/feed.tpl") + +func writeHtml(writer io.Writer, item feeditem) error { + return htmlTemplate.Execute(writer, item) +} +func writeToBuffer(b *bytes.Buffer, feed *Feed, item feeditem, cfg config.Config) error { var h mail.Header h.SetAddressList("From", fromAdress(feed, item, cfg)) h.SetAddressList("To", address(feed.Name, cfg.DefaultEmail)) @@ -55,31 +61,69 @@ func asMail(feed Feed, item feeditem, cfg config.Config) (string, error) { h.SetSubject(subject) } - mw, err := mail.CreateWriter(&b, h) + mw, err := mail.CreateWriter(b, h) if err != nil { - return "", err + return err } + defer mw.Close() - if cfg.WithPartText() { - tw, err := mw.CreateInline() - if err != nil { - return "", err - } + tw, err := mw.CreateInline() + if err != nil { + return err + } + defer tw.Close() + if false /* cfg.WithPartText() */ { var th mail.InlineHeader th.SetContentType("text/plain", map[string]string{"charset": "utf-8", "format": "flowed"}) w, err := tw.CreatePart(th) if err != nil { - return "", err + return err } + defer w.Close() + _, _ = io.WriteString(w, "Who are you?") + } + + if cfg.WithPartHtml() { + var th mail.InlineHeader + th.SetContentType("text/html", map[string]string{"charset": "utf-8"}) + + w, err := tw.CreatePart(th) + if err != nil { + return err + } + + if err = writeHtml(w, item); err != nil { + return fmt.Errorf("writing html part: %w", err) + } - _ = w.Close() - _ = tw.Close() + w.Close() } - _ = mw.Close() + return nil +} + +func asMail(feed *Feed, item feeditem, cfg config.Config) (string, error) { + var b bytes.Buffer + + if err := writeToBuffer(&b, feed, item, cfg); err != nil { + return "", err + } return b.String(), nil } + +func (feed *Feed) ToMails(cfg config.Config) ([]string, error) { + var ( + err error + mails = make([]string, len(feed.items)) + ) + for idx := range feed.items { + if mails[idx], err = asMail(feed, feed.items[idx], cfg); err != nil { + return nil, fmt.Errorf("creating mails for %s: %w", feed.Name, err) + } + } + return mails, nil +} diff --git a/internal/feed/parse.go b/internal/feed/parse.go index 00b6aff..22d16f2 100644 --- a/internal/feed/parse.go +++ b/internal/feed/parse.go @@ -26,8 +26,8 @@ func parseFeed(feed *Feed) error { feed.feed = parsedFeed feed.items = make([]feeditem, len(parsedFeed.Items)) - for _, item := range parsedFeed.Items { - feed.items = append(feed.items, feeditem{parsedFeed, item}) + for idx, item := range parsedFeed.Items { + feed.items[idx] = feeditem{parsedFeed, item} } return nil } -- cgit v1.2.3-70-g09d2