Merge pull request #8 from eldipa/Use-User-Provided-Feed-Name

feed2maildir/converter.py

@@ -111,6 +111,7 @@ def find_new(self, feeds, db, writedb=True, dbfile=None):
         newtimes = {}
         for feed in feeds:
             feedname = feed.feed.title
+            feedaliasname = feed.feed_alias_name
             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
@@ -136,9 +137,9 @@ def find_new(self, feeds, db, writedb=True, dbfile=None):
                         feedtime = feedtime.replace(tzinfo=dateutil.tz.tzutc())
                     if not oldtime or oldtime < feedtime:
                         try: # to append the post the the feed-list
-                            new[feedname].append(post)
+                            new[feedaliasname].append(post)
                         except: # it is the first one, make a new list
-                            new[feedname] = [post, ]
+                            new[feedaliasname] = [post, ]
             if writedb:
                 newtimes[feedname] = feedup.strftime('%Y-%m-%d %H:%M:%S %Z')
 

feed2maildir/reader.py

@@ -11,6 +11,7 @@ def __init__(self, feeds, silent=False):
             if f.bozo:
                 self.output('WARNING: could not parse feed {}'.format(feed))
             else:
+                f.feed_alias_name = feed # user provided text
                 self.feeds.append(f)
 
     def output(self, arg):

feed2maildir/tests/convertertests.py

@@ -45,6 +45,7 @@ def setUp(self):
                 ),
             ],
         )
+        self.testfeed.feed_alias_name = self.testfeed.feed.title
         self.test = [self.testfeed, ]
 
     def test_read_nonexistent_db(self):
@@ -69,7 +70,7 @@ def test_convert_valid_input(self):
         converter = Converter(db='/tmp/db')
         converter.load(self.test)
         self.assertEqual(len(converter.feeds), 1)
-        self.assertEqual(len(converter.feeds[0]), 2)
+        self.assertEqual(len(converter.feeds[0]), 3)
 
     def test_fail_to_make_maildir(self):
         converter = Converter(maildir='/maildir', db='/tmp/db', silent=True)