minor improvements

fixed a few things in rss module, minor improvements to other modules.
Added test file for use without installing

inkycal/modules/inkycal_rss.py

@@ -18,7 +18,8 @@ except ImportError:
 # Debug Data (not for production use!)
 size = (384, 160)
 config = {'rss_urls': ['http://feeds.bbci.co.uk/news/world/rss.xml#']}
-
+#config = {'rss_urls': ['http://www.tagesschau.de/xml/atom/']}
+#https://www.tagesschau.de/xml/rss2
 
 class rss:
   """RSS class
@@ -34,14 +35,15 @@ class rss:
     self.name = os.path.basename(__file__).split('.py')[0]
     self.config = section_config
     self.width, self.height = section_size
-
-    self.background_colour =  'white'
-    self.font_colour = 'black'
     self.fontsize = 12
-    self.font = ImageFont.truetype(fonts['NotoSans-SemiCondensed'],
-                                   size = self.fontsize)
     self.padding_x = 0.02
     self.padding_y = 0.05
+    self.font = ImageFont.truetype(fonts['NotoSans-SemiCondensed'],
+                                   size = self.fontsize)
+
+    # module specifc config
+    self.shuffle_feeds = True
+
     print('{0} loaded'.format(self.name))
 
   def set(self, **kwargs):
@@ -76,15 +78,14 @@ class rss:
     logging.info('image size: {} x {} px'.format(im_width, im_height))
 
     # Create an image for black pixels and one for coloured pixels
-    im_black = Image.new('RGB', size = im_size, color = self.background_colour)
+    im_black = Image.new('RGB', size = im_size, color = 'white')
     im_colour = Image.new('RGB', size = im_size, color = 'white')
 
     # Check if internet is available
     if internet_available() == True:
       logging.info('Connection test passed')
     else:
-      logging.error('Network could not be reached :/')
-      raise Exception('Network could not be reached :(')
+      raise Exception('Network could not be reached :/')
 
 
     # Set some parameters for formatting rss feeds
@@ -101,46 +102,48 @@ class rss:
       (0, spacing_top + _ * line_height ) for _ in range(max_lines)]
 
 
-    try:
-      # Create list containing all rss-feeds from all rss-feed urls
-      parsed_feeds = []
-      for feeds in self.config['rss_urls']:
-        text = feedparser.parse(feeds)
-        for posts in text.entries:
-          parsed_feeds.append('•{0}: {1}'.format(posts.title, posts.summary))
-      # print(parsed_feeds)
 
-      # Shuffle the list to prevent showing the same content
+    # Create list containing all rss-feeds from all rss-feed urls
+    parsed_feeds = []
+    for feeds in self.config['rss_urls']:
+      text = feedparser.parse(feeds)
+      for posts in text.entries:
+        parsed_feeds.append('•{0}: {1}'.format(posts.title, posts.summary))
+
+    self._parsed_feeds = parsed_feeds
+
+    # Shuffle the list to prevent showing the same content
+    if self.shuffle_feeds == True:
       shuffle(parsed_feeds)
 
-      # Trim down the list to the max number of lines
-      del parsed_feeds[max_lines:]
+    # Trim down the list to the max number of lines
+    del parsed_feeds[max_lines:]
 
+    # Wrap long text from feeds (line-breaking)
+    flatten = lambda z: [x for y in z for x in y]
+    filtered_feeds, counter = [], 0
 
-      # Wrap long text from feeds (line-breaking)
-      flatten = lambda z: [x for y in z for x in y]
-      filtered_feeds, counter = [], 0
-
-      for posts in parsed_feeds:
-        wrapped = text_wrap(posts, font = self.font, max_width = line_width)
-        counter += len(filtered_feeds) + len(wrapped)
-        if counter < max_lines:
-          filtered_feeds.append(wrapped)
-      filtered_feeds = flatten(filtered_feeds)
+    for posts in parsed_feeds:
+      wrapped = text_wrap(posts, font = self.font, max_width = line_width)
+      counter += len(wrapped)
+      if counter < max_lines:
+        filtered_feeds.append(wrapped)
+    filtered_feeds = flatten(filtered_feeds)
+    self._filtered_feeds = filtered_feeds
 
+    # Check if feeds could be parsed and can be displayed
+    if len(filtered_feeds) == 0 and len(parsed_feeds) > 0:
+      print('Feeds could be parsed, but the text is too long to be displayed:/')
+    elif len(filtered_feeds) == 0 and len(parsed_feeds) == 0:
+      print('No feeds could be parsed :/')
+    else:
       # Write rss-feeds on image
-      """Write the correctly formatted text on the display"""
       for _ in range(len(filtered_feeds)):
         write(im_black, line_positions[_], (line_width, line_height),
               filtered_feeds[_], font = self.font, alignment= 'left')
 
-      # Cleanup
-      del filtered_feeds, parsed_feeds, wrapped, counter, text
-
-    except Exception as e:
-      print('Error in {0}'.format(self.name))
-      print('Reason: ',e)
-      write(im_black, (0,0), (im_width, im_height), str(e), font = self.font)
+    # Cleanup
+    del filtered_feeds, parsed_feeds, wrapped, counter, text
 
     # Save image of black and colour channel in image-folder
     im_black.save(images+self.name+'.png', 'PNG')
@@ -149,3 +152,6 @@ class rss:
 if __name__ == '__main__':
   print('running {0} in standalone mode'.format(
     os.path.basename(__file__).split('.py')[0]))
+
+##a = rss(size, config)
+##a.generate_image()