* be slightly more forgiving on connection resets

* if there's no date in the feed, use todays date/time

diff --git a/rss2maildir.py b/rss2maildir.py
index 4402c43884ae5271a201de8529ebc46271a5fcdc..d8cd3e4b109d4af1035f1ffd3b4d7cd935da721e 100755 (executable)
--- a/rss2maildir.py
+++ b/rss2maildir.py
@@ -299,7 +299,12 @@ def parse_and_deliver(maildir, url, statedir):
     else:
         conn = httplib.HTTPConnection("%s:%s" %(host, port))
         conn.request("GET", path)
     else:
         conn = httplib.HTTPConnection("%s:%s" %(host, port))
         conn.request("GET", path)

-        response = conn.getresponse()
+        response = None
+        try:
+            response = conn.getresponse()
+        except:
+            print "Failed to fetch feed: %s" %(url)
+            return

         headers = response.getheaders()
         feedhandle = response
 
         headers = response.getheaders()
         feedhandle = response
 


@@ -347,8 +352,13 @@ def parse_and_deliver(maildir, url, statedir):
         msg.add_header("To", "\"%s\" <rss2maildir@localhost>" %(url))
         if prevmessageid:
             msg.add_header("References", prevmessageid)
         msg.add_header("To", "\"%s\" <rss2maildir@localhost>" %(url))
         if prevmessageid:
             msg.add_header("References", prevmessageid)

-        createddate = datetime.datetime(*item["updated_parsed"][0:6]) \
+        createddate = datetime.datetime.now() \

             .strftime("%a, %e %b %Y %T -0000")
             .strftime("%a, %e %b %Y %T -0000")

+        try:
+            createddate = datetime.datetime(*item["updated_parsed"][0:6]) \
+                .strftime("%a, %e %b %Y %T -0000")
+        except:
+            pass

         msg.add_header("Date", createddate)
         msg.add_header("Subject", item["title"])
         msg.set_default_type("text/plain")
         msg.add_header("Date", createddate)
         msg.add_header("Subject", item["title"])
         msg.set_default_type("text/plain")