Skip to content

Commit dca5835

Browse files
committed
Revert move preset input-checking
1 parent e602444 commit dca5835

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

plugwise/__init__.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -361,10 +361,6 @@ async def set_schedule_state(
361361

362362
async def set_preset(self, loc_id: str, preset: str) -> None:
363363
"""Set the given Preset on the relevant Thermostat."""
364-
if (presets := self._presets(loc_id)) is None:
365-
raise PlugwiseError("Plugwise: no presets available.") # pragma: no cover
366-
if preset not in list(presets):
367-
raise PlugwiseError("Plugwise: invalid preset.")
368364
try:
369365
await self._smile_api.set_preset(loc_id, preset)
370366
except ConnectionFailedError as exc:

plugwise/legacy/smile.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,11 @@ async def set_offset(self, dev_id: str, offset: float) -> None:
169169

170170
async def set_preset(self, _: str, preset: str) -> None:
171171
"""Set the given Preset on the relevant Thermostat - from DOMAIN_OBJECTS."""
172+
if (presets := self._presets()) is None:
173+
raise PlugwiseError("Plugwise: no presets available.") # pragma: no cover
174+
if preset not in list(presets):
175+
raise PlugwiseError("Plugwise: invalid preset.")
176+
172177
locator = f'rule/directives/when/then[@icon="{preset}"].../.../...'
173178
rule_id = self._domain_objects.find(locator).attrib["id"]
174179
data = f"<rules><rule id='{rule_id}'><active>true</active></rule></rules>"

plugwise/smile.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,11 @@ async def set_offset(self, dev_id: str, offset: float) -> None:
202202

203203
async def set_preset(self, loc_id: str, preset: str) -> None:
204204
"""Set the given Preset on the relevant Thermostat - from LOCATIONS."""
205+
if (presets := self._presets(loc_id)) is None:
206+
raise PlugwiseError("Plugwise: no presets available.") # pragma: no cover
207+
if preset not in list(presets):
208+
raise PlugwiseError("Plugwise: invalid preset.")
209+
205210
current_location = self._domain_objects.find(f'location[@id="{loc_id}"]')
206211
location_name = current_location.find("name").text
207212
location_type = current_location.find("type").text

0 commit comments

Comments
 (0)