Improved code logic for better support with web-ui

Fixed some minor bugs too

inkycal/modules/inkycal_agenda.py

@@ -66,13 +66,18 @@ class Agenda(inkycal_module):
     self.date_format = config['date_format']
     self.time_format = config['time_format']
     self.language = config['language']
-    self.ical_urls = config['ical_urls'].split(',')
 
     # Check if ical_files is an empty string
-    if config['ical_files'] != "":
+    if config['ical_urls']:
+      self.ical_urls = config['ical_urls'].split(',')
+    else:
+      self.ical_urls = config['ical_urls']
+
+    # Check if ical_files is an empty string
+    if config['ical_files']:
       self.ical_files = config['ical_files'].split(',')
     else:
-      self.ical_files = []
+      self.ical_files = config['ical_files']
 
     # Additional config
     self.timezone = get_system_tz()

inkycal/modules/inkycal_calendar.py

@@ -65,20 +65,20 @@ class Calendar(inkycal_module):
 
     # optional parameters
     self.weekstart = config['week_starts_on']
-    self.show_events = bool(config['show_events'])
+    self.show_events = config['show_events']
     self.date_format = config["date_format"]
     self.time_format = config['time_format']
     self.language = config['language']
 
-    if config['ical_urls'] != "":
+    if config['ical_urls']:
       self.ical_urls = config['ical_urls'].split(',')
     else:
-      self.ical_urls = []
+      self.ical_urls = config['ical_urls']
 
-    if config['ical_files'] != "":
+    if config['ical_files']:
       self.ical_files = config['ical_files'].split(',')
     else:
-      self.ical_files = []
+      self.ical_files = config['ical_files']
 
     # additional configuration
     self.timezone = get_system_tz()
@@ -117,7 +117,7 @@ class Calendar(inkycal_module):
       logger.debug(f'events-section size: {im_width} x {events_height} px')
     else:
       logger.debug("Not allocating space for events")
-      calendar_height = im_height - month_name_height - weekday_height
+      calendar_height = im_height - month_name_height - weekdays_height
       logger.debug(f'calendar-section size: {im_width} x {calendar_height} px')
 
     # Create a 7x6 grid and calculate icon sizes

inkycal/modules/inkycal_feeds.py

@@ -60,7 +60,7 @@ class Feeds(inkycal_module):
     self.feed_urls = self.config["feed_urls"].split(",")
 
     # optional parameters
-    self.shuffle_feeds = bool(self.config["shuffle_feeds"])
+    self.shuffle_feeds = self.config["shuffle_feeds"]
 
     # give an OK message
     print('{0} loaded'.format(filename))