Minor code improvements

RogerSelwyn · Mar 20, 2023 · 4dccb9e · 4dccb9e
1 parent 222fa95
commit 4dccb9e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/custom_components/o365/__init__.py b/custom_components/o365/__init__.py
@@ -68,8 +68,8 @@ async def _async_legacy_migration_repair(hass):
     url = "https://rogerselwyn.github.io/O365-HomeAssistant/legacy_migration.html"
     message = (
         "Secondary/Legacy configuration method is now deprecated and will be "
-        + "removed in a future release. Please migrate to the Primary configuration method "
-        + "documented here - "
+        + "removed in a future release. Please migrate to the Primary configuration "
+        + "method documented here - "
         + f"{url}"
     )
     _LOGGER.warning(message)

diff --git a/custom_components/o365/calendar.py b/custom_components/o365/calendar.py
@@ -52,6 +52,7 @@
     EVENT_HA_EVENT,
     EVENT_MODIFY_CALENDAR_EVENT,
     EVENT_REMOVE_CALENDAR_EVENT,
+    EVENT_REMOVE_CALENDAR_RECURRENCES,
     EVENT_RESPOND_CALENDAR_EVENT,
     LEGACY_ACCOUNT_NAME,
     PERM_CALENDARS_READWRITE,
@@ -444,11 +445,16 @@ def remove_calendar_event(self, event_id, recurrence_id, recurrence_range):
             return
 
         if recurrence_range:
-            event = self._get_event_from_calendar(recurrence_id)
+            self._delete_calendar_event(
+                recurrence_id, EVENT_REMOVE_CALENDAR_RECURRENCES
+            )
         else:
-            event = self._get_event_from_calendar(event_id)
+            self._delete_calendar_event(event_id, EVENT_REMOVE_CALENDAR_EVENT)
+
+    def _delete_calendar_event(self, event_id, ha_event):
+        event = self._get_event_from_calendar(event_id)
         event.delete()
-        self._raise_event(EVENT_REMOVE_CALENDAR_EVENT, event_id)
+        self._raise_event(ha_event, event_id)
 
     def respond_calendar_event(
         self, event_id, response, send_response=True, message=None

diff --git a/custom_components/o365/const.py b/custom_components/o365/const.py
@@ -123,6 +123,7 @@ class EventResponse(Enum):
 EVENT_CREATE_CALENDAR_EVENT = "create_calendar_event"
 EVENT_MODIFY_CALENDAR_EVENT = "modify_calendar_event"
 EVENT_REMOVE_CALENDAR_EVENT = "remove_calendar_event"
+EVENT_REMOVE_CALENDAR_RECURRENCES = "remove_calendar_recurrences"
 EVENT_RESPOND_CALENDAR_EVENT = "respond_calendar_event"
 
 LEGACY_ACCOUNT_NAME = "converted"