Skip to content

Commit 037f65a

Browse files
committed
Cleanup &improve schedule-related functions
1 parent 52b9515 commit 037f65a

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

plugwise/helper.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def check_model(name: str, v_name: str) -> str:
9898
return name
9999

100100

101-
def schemas_schedule_temp(schedules: dict[str], name: str) -> float | None:
101+
def schemas_schedule_temp(schedules: dict[str, Any], name: str) -> float | None:
102102
"""Helper-function for schemas().
103103
Obtain the schedule temperature of the schema/schedule.
104104
"""
@@ -120,7 +120,8 @@ def schemas_schedule_temp(schedules: dict[str], name: str) -> float | None:
120120

121121
# Schema with less than 2 items
122122
if length == 1:
123-
return schema_list[0][2]
123+
LOGGER.debug("Invalid schedule, only one entry, ignoring.")
124+
return
124125

125126
for i in range(length):
126127
result_1 = schema_list[i][0]
@@ -1203,10 +1204,10 @@ def _schemas(self, location: str) -> tuple[str, ...]:
12031204
if not (rule_ids := self._rule_ids_by_tag(tag, location)):
12041205
return available, selected, schedule_temperature, None
12051206

1206-
schedules: dict[str] = {}
1207+
schedules: dict[str, Any] = {}
12071208
for rule_id, loc_id in rule_ids.items():
12081209
name = self._domain_objects.find(f'rule[@id="{rule_id}"]/name').text
1209-
schedule: dict[str] = {}
1210+
schedule: dict[str, float] = {}
12101211
locator = f'rule[@id="{rule_id}"]/directives'
12111212
directives = self._domain_objects.find(locator)
12121213
for directive in directives:
@@ -1225,10 +1226,6 @@ def _schemas(self, location: str) -> tuple[str, ...]:
12251226
selected = name
12261227
self._last_active[location] = selected
12271228
schedules[name] = schedule
1228-
else:
1229-
LOGGER.debug(
1230-
"Schedule %s has no preset switching moments, ignoring.", name
1231-
)
12321229

12331230
if schedules:
12341231
available.remove("None")

0 commit comments

Comments
 (0)