# HG changeset patch
# User Malcolm <malcolm@terrateam.io>
# Date 1737713128 -3600
#      Fri Jan 24 11:05:28 2025 +0100
# Node ID f732754931672505533fda901557d8bd2a42eabf
# Parent  17580562558ad542cf10d71493cbab56c2629f55
FIX Switch to curl because reddit started denying these requests, handle failure more gracefully

diff --git a/feed2maildir/converter.py b/feed2maildir/converter.py
--- a/feed2maildir/converter.py
+++ b/feed2maildir/converter.py
@@ -109,7 +109,7 @@
         newtimes = {}
         for feedname, feed in feeds.items():
             self.output('Processing : {}'.format(feedname))
-            if feed is not None:
+            if feed is not None and feed.entries:
                 try: # to get the update time from the feed itself
                     feedup = self.mktime(feed.feed.updated)
                 except: # there is no info, then find it in the posts
@@ -153,7 +153,10 @@
                         db[feedname]).astimezone(
                             dateutil.tz.tzutc()).strftime('%Y-%m-%d %H:%M:%S %Z')
 
-            self.output('Feedname : {} : Feedup : {}'.format(feedname, newtimes[feedname]))
+            if feedname in newtimes:
+                self.output('Feedname : {} : Feedup : {}'.format(feedname, newtimes[feedname]))
+            else:
+                self.output('Feedname : {} : Not Updated'.format(feedname))
 
         return (new, newtimes)
 
diff --git a/feed2maildir/reader.py b/feed2maildir/reader.py
--- a/feed2maildir/reader.py
+++ b/feed2maildir/reader.py
@@ -1,3 +1,5 @@
+import subprocess
+
 import feedparser
 
 class Reader:
@@ -7,7 +9,8 @@
         self.feeds = {}
         self.silent = silent
         for feed in feeds:
-            f = feedparser.parse(feeds[feed])
+            subprocess.check_call(['curl', '-s', '-L', '-o', '/tmp/feed2maildir.xml', feeds[feed]])
+            f = feedparser.parse(open('/tmp/feed2maildir.xml', 'rb'))
             if f.bozo:
                 self.output('WARNING: could not parse feed {}'.format(feed))
                 self.output('WARNING: {}'.format(f.bozo_exception))
diff --git a/scripts/feed2maildir b/scripts/feed2maildir
--- a/scripts/feed2maildir
+++ b/scripts/feed2maildir
@@ -22,6 +22,8 @@
                         help='strip HTML from the feed content')
     parser.add_argument('-l', action='store_true',
                         help='just write the links without the content')
+    parser.add_argument('-f', metavar='<feed>',
+                        help='Limit to a specific feed')
     args = vars(parser.parse_args())
 
     if args['c']:
@@ -29,6 +31,10 @@
     else:
         loader = Loader()
     config = loader.config
+
+    if args['f']:
+        config['feeds'] = {args['f']: config['feeds'][args['f']]}
+
     reader = Reader(config['feeds'])
 
     if args['d']:
@@ -47,6 +53,7 @@
     converter.load(reader.feeds)
     converter.run()
 
+
 if __name__ == '__main__':
     main()