Merge branch 'master' of github.com:skx/rss2email

config_cmd.go

@@ -118,6 +118,7 @@ notify        | Comma-delimited list of emails to send notifications to (if set,
               | replaces the emails set in the cron/daemon command).
 retry         | The maximum number of times to retry a failing HTTP-fetch.
 sleep         | Sleep the specified number of seconds, before making the request.
+tag           | Setup a tag for this feed, which can be accessed in the template.
 template      | The path to a feed-specific email template to use.
 user-agent    | Configure a specific User-Agent when making HTTP requests.
 

processor/emailer/emailer.go

@@ -151,12 +151,13 @@ func (e *Emailer) Sendmail(addresses []string, textstr string, htmlstr string) e
 		type TemplateParms struct {
 			Feed      string
 			FeedTitle string
-			To        string
 			From      string
-			Text      string
 			HTML      string
-			Subject   string
 			Link      string
+			Subject   string
+			Tag       string
+			Text      string
+			To        string
 
 			// In case people need access to fields
 			// we've not wrapped/exported explicitly
@@ -176,6 +177,7 @@ func (e *Emailer) Sendmail(addresses []string, textstr string, htmlstr string) e
 		x.To = addr
 		x.RSSFeed = e.feed
 		x.RSSItem = e.item
+		x.Tag = e.item.Tag
 
 		// The real meat of the mail is the text & HTML
 		// parts.  They need to be encoded, unconditionally.

processor/processor.go

@@ -229,6 +229,16 @@ func (p *Processor) message(msg string) {
 // specifically excluded by the per-feed options.
 func (p *Processor) processFeed(entry configfile.Feed, recipients []string) error {
 
+	// Is there a tag set for this feed?
+	tag := ""
+
+	// Look at each per-feed option to determine that
+	for _, opt := range entry.Options {
+		if strings.ToLower(opt.Name)== "tag"  {
+			tag = opt.Value
+		}
+	}
+
 	// Show what we're doing.
 	p.message(fmt.Sprintf("Fetching feed: %s", entry.URL))
 
@@ -262,6 +272,11 @@ func (p *Processor) processFeed(entry configfile.Feed, recipients []string) erro
 		// but that will go away in the future.
 		item := withstate.FeedItem{Item: xp}
 
+		// Set the tag for the item, if present.
+		if tag != "" {
+			item.Tag = tag
+		}
+
 		// Keep track of the fact that we saw this feed-item.
 		//
 		// This is used for pruning the BoltDB state file.

template/template.txt

@@ -27,7 +27,7 @@
 Content-Type: multipart/mixed; boundary=21ee3da964c7bf70def62adb9ee1a061747003c026e363e47231258c48f1
 From: {{.From}}
 To: {{.To}}
-Subject: [rss2email] {{.Subject}}
+Subject: [rss2email] {{if .Tag}}{{.Tag}} {{end}}{{.Subject}}
 X-RSS-Link: {{.Link}}
 X-RSS-Feed: {{.Feed}}
 X-RSS-GUID: {{.RSSItem.GUID}}

template/template_test.go

@@ -4,13 +4,10 @@ import "testing"
 
 func TestTemplate(t *testing.T) {
 
-	// content of our template
+	// content and expected length
 	content := EmailTemplate()
+	length  := 2484
 
-	// expected template length
-	length := 2457
-
-	// check the content is as big as it should be.
 	if len(content) != length {
 		t.Fatalf("unexpected template size %d != %d", length, len(content))
 	}

withstate/feeditem.go

@@ -30,6 +30,10 @@ type FeedItem struct {
 
 	// Wrapped structure
 	*gofeed.Item
+
+	// Tag is a field that can be set for this feed item,
+	// inside our configuration file.
+	Tag string
 }
 
 // IsNew reports whether this particular feed-item is new.

withstate/feeditem_test.go

@@ -13,8 +13,8 @@ func TestCollision(t *testing.T) {
 	// So we want to have two feed items with the same
 	// GUID.  They should map to the same file, so we
 	// can confirm they would be treated as identical
-	a := &FeedItem{&gofeed.Item{}}
-	b := &FeedItem{&gofeed.Item{}}
+	a := &FeedItem{&gofeed.Item{}, ""}
+	b := &FeedItem{&gofeed.Item{}, ""}
 
 	a.GUID = "steve"
 	b.GUID = "steve"
@@ -43,8 +43,8 @@ func TestCollisionMissingHome(t *testing.T) {
 	// So we want to have two feed items with the same
 	// GUID.  They should map to the same file, so we
 	// can confirm they would be treated as identical
-	a := &FeedItem{&gofeed.Item{}}
-	b := &FeedItem{&gofeed.Item{}}
+	a := &FeedItem{&gofeed.Item{}, ""}
+	b := &FeedItem{&gofeed.Item{}, ""}
 
 	a.GUID = "steve"
 	b.GUID = "steve"