evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Harden zone schedule processing for evohome (#108079)

Browse source
This commit is contained in:
David Bonnes 2024-01-15 10:24:55 +00:00 • committed by GitHub
parent 4d7186b6e6
commit 7f619579fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
homeassistant/components/evohome/__init__.py
View file

@ -673,7 +673,7 @@ class EvoChild(EvoDevice):
dt_aware = dt_naive.replace(tzinfo=dt_util.UTC) - utc_offset dt_aware = dt_naive.replace(tzinfo=dt_util.UTC) - utc_offset
return dt_util.as_local(dt_aware) return dt_util.as_local(dt_aware)
if not self._schedule or not self._schedule.get("DailySchedules"): if not (schedule := self._schedule.get("DailySchedules")):
return {} # no scheduled setpoints when {'DailySchedules': []} return {} # no scheduled setpoints when {'DailySchedules': []}
day_time = dt_util.now() day_time = dt_util.now()
@ -682,7 +682,7 @@ class EvoChild(EvoDevice):
try: try:
# Iterate today's switchpoints until past the current time of day... # Iterate today's switchpoints until past the current time of day...
day = self._schedule["DailySchedules"][day_of_week] day = schedule[day_of_week]
sp_idx = -1 # last switchpoint of the day before sp_idx = -1 # last switchpoint of the day before
for i, tmp in enumerate(day["Switchpoints"]): for i, tmp in enumerate(day["Switchpoints"]):
if time_of_day > tmp["TimeOfDay"]: if time_of_day > tmp["TimeOfDay"]:
@ -699,7 +699,7 @@ class EvoChild(EvoDevice):
("next", next_sp_day, (sp_idx + 1) * (1 - next_sp_day)), ("next", next_sp_day, (sp_idx + 1) * (1 - next_sp_day)),
): ):
sp_date = (day_time + timedelta(days=offset)).strftime("%Y-%m-%d") sp_date = (day_time + timedelta(days=offset)).strftime("%Y-%m-%d")
day = self._schedule["DailySchedules"][(day_of_week + offset) % 7] day = schedule[(day_of_week + offset) % 7]
switchpoint = day["Switchpoints"][idx] switchpoint = day["Switchpoints"][idx]
switchpoint_time_of_day = dt_util.parse_datetime( switchpoint_time_of_day = dt_util.parse_datetime(
@ -730,9 +730,17 @@ class EvoChild(EvoDevice):
assert isinstance(self._evo_device, evo.HotWater | evo.Zone) # mypy check assert isinstance(self._evo_device, evo.HotWater | evo.Zone) # mypy check
self._schedule = await self._evo_broker.call_client_api( # type: ignore[assignment] try:
self._evo_device.get_schedule(), update_state=False self._schedule = await self._evo_broker.call_client_api( # type: ignore[assignment]
) self._evo_device.get_schedule(), update_state=False
)
except evo.InvalidSchedule as err:
_LOGGER.warning(
"%s: Unable to retrieve the schedule: %s",
self._evo_device,
err,
)
self._schedule = {}
_LOGGER.debug("Schedule['%s'] = %s", self.name, self._schedule) _LOGGER.debug("Schedule['%s'] = %s", self.name, self._schedule)