Merge pull request #770 from insanum/import-empty

Fix crash when importing empty ICS, add summary message w/ event count
insanum · Sep 22, 2024 · 6ba8de1 · 6ba8de1
2 parents 82744ae + a9075a1
commit 6ba8de1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/gcalcli/gcal.py b/gcalcli/gcal.py
@@ -1579,6 +1579,8 @@ def ImportICS(self, verbose=False, dump=False, reminders=None,
                 '--use-legacy-import to restore the old behavior.\n\n')
             time.sleep(1)
 
+        cal = self.cals[0]
+        imported_cnt = 0
         for event in events_to_import:
             if not event:
                 continue
@@ -1609,11 +1611,11 @@ def ImportICS(self, verbose=False, dump=False, reminders=None,
             # Import event
             import_method = (
                 self.get_events().import_ if (
-                    self._event_should_use_new_import_api(event, self.cals[0]))
+                    self._event_should_use_new_import_api(event, cal))
                 else self.get_events().insert)
             try:
                 new_event = self._retry_with_backoff(
-                    import_method(calendarId=self.cals[0]['id'], body=event))
+                    import_method(calendarId=cal['id'], body=event))
             except HttpError as e:
                 try:
                     is_skipped_dupe = any(detail.get('reason') == 'duplicate'
@@ -1635,8 +1637,12 @@ def ImportICS(self, verbose=False, dump=False, reminders=None,
                     self.printer.msg(f'Event details: {event}\n')
                     self.printer.debug_msg(f'Error details: {e}\n')
             else:
+                imported_cnt += 1
                 hlink = new_event.get('htmlLink')
                 self.printer.msg(f'New event added: {hlink}\n', 'green')
 
-        # TODO: return the number of events added
+        self.printer.msg(
+            f"Added {imported_cnt} events to calendar {cal['id']}\n"
+        )
+
         return True
diff --git a/gcalcli/ics.py b/gcalcli/ics.py
@@ -22,11 +22,14 @@ def get_events(
 
     events: list[Optional[EventBody]] = []
     for v in vobject.readComponents(ics):
+        # Strangely, in empty calendar cases vobject sometimes returns
+        # Components with no vevent_list attribute at all.
+        vevents = getattr(v, 'vevent_list', [])
         events.extend(
             CreateEventFromVOBJ(
                 ve, verbose=verbose, default_tz=default_tz, printer=printer
             )
-            for ve in v.vevent_list
+            for ve in vevents
         )
     return events