From: Aaron Swartz <me@aaronsw.com>
Date: Fri, 30 Jan 2004 12:03:00 +0000 (+0000)
Subject: Add rss2email v2.26
X-Git-Tag: v2.26
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6f751164bf9f0cc773a35ed8920eeecc11998e93;p=rss2email.git

Add rss2email v2.26

Fix for typo, email replacement. Added VERBOSE, FORCE_FROM options and
redirect support. Tx Alan D., Pete Prodoehi, Matej.

Downloaded from:

  http://web.archive.org/web/20040416223613/http://www.aaronsw.com/2002/rss2email/rss2email-2.26.py
---

diff --git a/rss2email.py b/rss2email.py
index 0556199..9478cea 100644
--- a/rss2email.py
+++ b/rss2email.py
@@ -6,13 +6,13 @@ Usage: python rss2email.py feedfile action [options]
   feedfile: name of the file to store feed info in
   action [options]:
 	new [youremail] (create new feedfile)
-	email [yournewemail] (update defauly email)
+	email [yournewemail] (update default email)
 	run
 	add feedurl [youremail]
 	list
 	delete n
 """
-__version__ = "2.25"
+__version__ = "2.26"
 __author__ = "Aaron Swartz (me@aaronsw.com)"
 __copyright__ = "(C) 2004 Aaron Swartz. GNU GPL 2."
 ___contributors__ = ["Dean Jackson (dino@grorg.org)", 
@@ -24,6 +24,10 @@ ___contributors__ = ["Dean Jackson (dino@grorg.org)",
 # The email address messages are from by default:
 DEFAULT_FROM = "bozo@dev.null"
 
+# 1: Only use the DEFAULT_FROM address.
+# 0: Use the email address specified by the feed, when possible.
+FORCE_FROM = 0
+
 # 1: Receive one email per post
 # 0: Receive an email every time a post changes
 TRUST_GUID = 1
@@ -37,6 +41,10 @@ TREAT_DESCRIPTION_AS_HTML = 1
 # http://cr.yp.to/smtp/8bitmime.html
 QP_REQUIRED = 0
 
+# 1: Name feeds as they're being processed.
+# 0: Keep quiet.
+VERBOSE = 0
+
 def send(fr, to, message):
 	i, o = os.popen2(["/usr/sbin/sendmail", to])
 	i.write(message)
@@ -129,8 +137,11 @@ def run():
 	else: ifeeds = feeds
 	
 	for f in ifeeds:
+		if VERBOSE: print "Processing", f.url
 		result = feedparser.parse(f.url, f.etag, f.modified)
 		
+		if result['status'] == 301: f.url = result['url']
+		
 		if result.has_key('encoding'): enc = result['encoding']
 		else: enc = 'utf-8'
 		
@@ -139,7 +150,7 @@ def run():
 		headers = "From: "
 		if c.has_key('title'): headers += quoteEmailName(e(c, 'title')) + ' '
 		if c.has_key(ert) and c[ert].startswith('mailto:'):
-			fr = c[ert][8:]
+			fr = c[ert][7:]
 		else:
 			fr = DEFAULT_FROM