Fixing multiple PRODID lines

anufrievroman · Mar 9, 2023 · 83b81c0 · 83b81c0
1 parent 5d93bca
commit 83b81c0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/calcure/configuration.py b/calcure/configuration.py
@@ -99,7 +99,7 @@ def create_config_file(self):
                 "color_active_pane":     "2",
                 "color_separator":       "7",
                 "color_calendar_border": "7",
-                "color_ics_calendars":   "2,3,1,7",
+                "color_ics_calendars":   "2,3,1,7,4,5,2,3,1,7",
                 "color_background":      "-1",
                 }
 

diff --git a/calcure/loaders.py b/calcure/loaders.py
@@ -224,14 +224,16 @@ class LoaderICS:
 
     def read_lines(self, file):
         """Read the file line-by-line and remove multiple PRODID lines"""
-        previous_line = ""
+        already_has_prodid = False
         text = ""
         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)):
+            if ((not (already_has_prodid and "PRODID:" in line)) and
+                (not "TZUNTIL" in line)):
                 text += line
-            previous_line = line
+
+            if "PRODID:" in line:
+                already_has_prodid = True
         return text
 
     def read_file(self, path):