Integration fixes and improvements

StealthTech · Jul 18, 2017 · 9d90fe0 · 9d90fe0
1 parent 8103694
commit 9d90fe0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/core.py b/core.py
@@ -23,12 +23,13 @@ def menu_option_fetch():
 
     counter = 1
     for entry in entries:
-        entry.parse()
+        if not entry.url:
+            entries_no_url.append(entry)
+            continue
 
+        entry.parse()
         if entry.request_error:
             entries_cant_reach.append(entry)
-        elif entry.url == '':
-            entries_no_url.append(entry)
         elif len(entry.rss):
             entries_has_rss.append(entry)
         elif entry.rss_in_text:
@@ -42,6 +43,8 @@ def menu_option_fetch():
             for rss in entry.rss:
                 print(f'   ∟ {subcounter}. {rss}')
                 subcounter += 1
+        elif not entry.url:
+            print(f'{counter}. {entry.entry} :: Invalid entry format')
         else:
             print(f'{counter}. {entry.url} :: {entry.title} :: No RSS channels found')
 

diff --git a/rssutils/rssutils.py b/rssutils/rssutils.py
@@ -4,6 +4,7 @@
 
 _rss_word_pattern = '([^a-z]|^)rss([^a-z]|$)'
 
+
 def search_rss_meta(html):
     soup = BeautifulSoup(html, 'html.parser')
     meta = soup.find_all('link', {'type': 'application/rss+xml'})
@@ -113,7 +114,7 @@ def parse(self):
         if title is None or title.text is None:
             self.title = '[ Page title is missing ]'
         else:
-            self.title = title.text
+            self.title = str(title.text).strip()
 
         for handler in Entry.rss_finders:
             result = handler(html)

diff --git a/utils.py b/utils.py
@@ -32,7 +32,7 @@ def load(filename):
     result = None
     try:
         with open(filepath, 'r') as f:
-            result = f.readlines()
+            result = f.read().strip().split('\n')
     except IsADirectoryError as e:
         cast_exception(e)
     except FileNotFoundError as e:
@@ -59,8 +59,9 @@ def dump(entries, filename, heading=None):
             if heading:
                 f.write(f'::: {heading} :::\n\n')
             if len(entries):
-                for entry in entries:
-                    f.write(f'Entry: {entry.entry}')
+                for number, entry in enumerate(entries):
+                    f.write(f'= = = = = = = = = = {number} = = = = = = = = = =\n')
+                    f.write(f'Entry: {entry.entry}\n')
                     f.write(f'Title: {entry.title}\n')
                     f.write(f'URL: {entry.url}\n')