Cleaning up the loading of ics

anufrievroman · Mar 4, 2023 · be6a938 · be6a938
1 parent 4e7c273
commit be6a938
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/calcure/__main__.py b/calcure/__main__.py
@@ -39,7 +39,7 @@
     from calcure.translations.en import *
 
 
-__version__ = "2.8.1"
+__version__ = "2.8.2"
 
 
 def read_items_from_user_arguments(screen, user_tasks, user_events, task_saver_csv, event_saver_csv):

diff --git a/calcure/loaders.py b/calcure/loaders.py
@@ -229,15 +229,15 @@ def read_lines(self, file):
         for line in file:
             # If there is more than one PRODID line or a TZUNTIL line, skip them:
             if (not ("PRODID:" in line and "PRODID:" in previous_line) and
-               not ("TZUNTIL" in line)):
+                not ("TZUNTIL" in line)):
                 text += line
             previous_line = line
         return text
 
     def read_file(self, path):
         """Parse an ics file if it exists"""
         if not os.path.exists(path):
-            logging.error("Failed to load %s. Probably path is incorrect.", path)
+            logging.error("Failed to load %s because file does not exist.", path)
             return ""
         with open(path, 'r', encoding="utf-8") as file:
             return self.read_lines(file)
@@ -249,10 +249,10 @@ def read_url(self, path):
                 file = io.TextIOWrapper(response, 'utf-8')
                 return self.read_lines(file)
         except urllib.error.HTTPError:
-            logging.error("Failed to load %s. Probably url is wrong.", path)
+            logging.error("Failed to load from %s. Probably url is wrong.", path)
             return ""
         except urllib.error.URLError:
-            logging.error("Failed to load %s. Probably no internet connection.", path)
+            logging.error("Failed to load from %s. Probably no internet connection.", path)
             return ""
 
     def read_resource(self, path):
@@ -337,12 +337,8 @@ def load(self):
                                             year, month, day, calendar_number)
                             self.user_ics_tasks.add_item(new_task)
 
-                except NotImplementedError: # More than one calendar in the file
-                    logging.error("Failed to load %s. Probably more that one calendar in this file.", filename)
-                    pass
                 except Exception:
-                    logging.error("Failed to load %s.", filename)
-                    pass
+                    logging.error("Failed to parse %s.", filename)
         return self.user_ics_tasks
 
 
@@ -402,11 +398,7 @@ def load(self):
                                               frequency, status, is_private, calendar_number)
                         self.user_ics_events.add_item(new_event)
 
-                except NotImplementedError:  # More than one calendar in the file
-                    logging.error("Failed to load %s. Probably more that one calendar in this file", filename)
-                    pass
                 except Exception:
-                    logging.error("Failed to load %s.", filename)
-                    pass
+                    logging.error("Failed to parse %s.", filename)
 
         return self.user_ics_events