Merge pull request #130 from xgi/feature/128-opml-import-empty

fix parsing of opml to find proper container elements

fixes #128

Author: xgi

castero/feed.py

@@ -213,7 +213,7 @@ def _validate_feed(self):
                 if root_child.tag == 'channel':
                     channel = root_child
                     break
-            if not channel:
+            if channel is None:
                 raise FeedStructureError(
                     "RSS feed does not have a channel tag as its child")
 

castero/subscriptions.py

@@ -1,7 +1,7 @@
 import xml.etree.ElementTree as ElementTree
 from typing import List
 
-from castero.feed import Feed, FeedDownloadError
+from castero.feed import Feed, FeedDownloadError, FeedParseError
 
 
 class SubscriptionsError(Exception):
@@ -138,6 +138,8 @@ def parse(self) -> None:
                     yield feed
                 except FeedDownloadError as e:
                     yield (entry.attrib['xmlUrl'], e)
+                except FeedParseError as e:
+                    yield (entry.attrib['xmlUrl'], e)
 
     def _find_rss_container(self, container):
         """Find potentially-nested container for RSS feeds.
@@ -153,7 +155,7 @@ def _find_rss_container(self, container):
             return None
 
         if 'type' in outline.attrib and \
-                outline.attrib['type'].lower() == 'rss':
+                outline.attrib['type'].lower() in ['rss', 'link']:
             return container
         else:
             return self._find_rss_container(outline)