From 965b9a6d0c9a1d9aee9ea40b4f1485130f7028d4 Mon Sep 17 00:00:00 2001
From: Andrew Grimberg <tykeal@bardicgrove.org>
Date: Fri, 18 Mar 2022 08:17:18 -0700
Subject: [PATCH] Refactor: Separate calendar refresh from update

Separate the calendar refresh logic from the update function. This will
allow for the calendar to be refreshed via different calls.

Issue: #79
Signed-off-by: Andrew Grimberg <tykeal@bardicgrove.org>
---
 custom_components/rental_control/__init__.py | 68 +++++++++++---------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/custom_components/rental_control/__init__.py b/custom_components/rental_control/__init__.py
index f3875d8..aefb1f9 100644
--- a/custom_components/rental_control/__init__.py
+++ b/custom_components/rental_control/__init__.py
@@ -173,39 +173,10 @@ async def async_get_events(
 
     @Throttle(MIN_TIME_BETWEEN_UPDATES)
     async def update(self):
-        """Update list of upcoming events."""
+        """Regularly update the calendar."""
         _LOGGER.debug("Running ICalEvents update for calendar %s", self.name)
 
-        session = async_get_clientsession(self.hass, verify_ssl=self.verify_ssl)
-        with async_timeout.timeout(REQUEST_TIMEOUT):
-            response = await session.get(self.url)
-        if response.status != 200:
-            _LOGGER.error(
-                "%s returned %s - %s", self.url, response.status, response.reason
-            )
-        else:
-            text = await response.text()
-            # Some calendars are for some reason filled with NULL-bytes.
-            # They break the parsing, so we get rid of them
-            event_list = icalendar.Calendar.from_ical(text.replace("\x00", ""))
-            start_of_events = dt.start_of_local_day()
-            end_of_events = dt.start_of_local_day() + timedelta(days=self.days)
-
-            self.calendar = self._ical_parser(
-                event_list, start_of_events, end_of_events
-            )
-
-        if len(self.calendar) > 0:
-            found_next_event = False
-            for event in self.calendar:
-                if event["end"] > dt.now() and not found_next_event:
-                    _LOGGER.debug(
-                        "Event %s it the first event with end in the future: %s",
-                        event["summary"],
-                        event["end"],
-                    )
-                    self.event = event
-                    found_next_event = True
+        await self._refresh_calendar()
 
     def update_config(self, config):
         """Update config entries."""
@@ -349,3 +320,38 @@ def _refresh_event_dict(self):
         days = dt.start_of_local_day() + timedelta(days=self.days)
 
         return [x for x in cal if x["start"].date() <= days.date()]
+
+    async def _refresh_calendar(self):
+        """Update list of upcoming events."""
+        _LOGGER.debug("Running ICalEvents _refresh_calendar for %s", self.name)
+
+        session = async_get_clientsession(self.hass, verify_ssl=self.verify_ssl)
+        with async_timeout.timeout(REQUEST_TIMEOUT):
+            response = await session.get(self.url)
+        if response.status != 200:
+            _LOGGER.error(
+                "%s returned %s - %s", self.url, response.status, response.reason
+            )
+        else:
+            text = await response.text()
+            # Some calendars are for some reason filled with NULL-bytes.
+            # They break the parsing, so we get rid of them
+            event_list = icalendar.Calendar.from_ical(text.replace("\x00", ""))
+            start_of_events = dt.start_of_local_day()
+            end_of_events = dt.start_of_local_day() + timedelta(days=self.days)
+
+            self.calendar = self._ical_parser(
+                event_list, start_of_events, end_of_events
+            )
+
+        if len(self.calendar) > 0:
+            found_next_event = False
+            for event in self.calendar:
+                if event["end"] > dt.now() and not found_next_event:
+                    _LOGGER.debug(
+                        "Event %s is the first event with end in the future: %s",
+                        event["summary"],
+                        event["end"],
+                    )
+                    self.event = event
+                    found_next_event = True