Merge pull request #264 from plugwise/fix_85910_2

Fix for Core #85910 based on v0.27.1 release

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# v0.27.4: Fix for HA Core Issue https://github.com/home-assistant/core/issues/85910
+
+(# v0.27.3, v0.27.2: not released)
+
 # v0.27.1: More cooling-related updates, based on additional info from Plugwise
 - Updates for Anna+Elga and Adam-OnOff systems
 - Loria/Thermastage fix

plugwise/helper.py

@@ -144,16 +144,26 @@ def schedules_temps(
 
     length = len(schedule_list)
     schedule_list = sorted(schedule_list)
+    before_first: bool = False
+    first_schedule_day: int = 0
     for i in range(length):
         j = (i + 1) % (length)
         now = dt.datetime.now().time()
         today = dt.datetime.now().weekday()
         day_0 = schedule_list[i][0]
-        day_1 = schedule_list[j][0]
-        if j < i:
-            day_1 = schedule_list[i][0] + 2
         time_0 = schedule_list[i][1]
+        day_1 = schedule_list[j][0]
         time_1 = schedule_list[j][1]
+        # Handle Monday-now is before first schedule point
+        if i == 0 and now < time_0:
+            before_first = True
+            first_schedule_day = day_0
+        # Roll over from end to beginning of schedule = next Monday
+        if j < i:
+            day_1 = first_schedule_day + 7  # day_7 = day_0, day_8 = day_1 etc.
+            # Roll over to next Monday when now is before first schedule point
+            if today == 0 and before_first:
+                today = 7
         if in_between(today, day_0, day_1, now, time_0, time_1):
             return schedule_list[i][2]
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "plugwise"
-version         = "0.27.1"
+version         = "0.27.4"
 license         = {file = "LICENSE"}
 description     = "Plugwise Smile (Adam/Anna/P1), Stretch and USB (Stick) module for Python 3."
 readme          = "README.md"

tests/test_smile.py

@@ -377,7 +377,7 @@ async def device_test(self, smile=pw_smile.Smile, testdata=None):
         _LOGGER.info("Asserting testdata:")
         bsw_list = ["binary_sensors", "central", "climate", "sensors", "switches"]
         # Make sure to test with the day set to Sunday, needed for full testcoverage of schedules_temps()
-        with freeze_time("2022-05-15 23:59:59"):
+        with freeze_time("2022-05-16 00:00:01"):
             await smile._full_update_device()
             smile.get_all_devices()
             data = await smile.async_update()