Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] 19 - Add schedule support for single zone heating in Hive boiler module #36

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

[WIP] 19 - Add schedule support for single zone heating in Hive boiler module #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ea9c5e
Support dictionary properties in api.setState()
martintoreilly Dec 30, 2021
99f044d
Support dictionary properties in async api.setState()
martintoreilly Dec 30, 2021
ccd2ddc
Merge branch 'Pyhass:master' into 19-add-schedule-support
martintoreilly Jan 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions pyhiveapi/apyhiveapi/api/hive_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,18 +208,12 @@ def getWeather(self, weather_url):

def setState(self, n_type, n_id, **kwargs):
"""Set the state of a Device."""
jsc = (
"{"
+ ",".join(
('"' + str(i) + '": ' '"' + str(t) + '" ' for i, t in kwargs.items())
)
+ "}"
)
json_string = json.dumps(kwargs)

url = self.urls["base"] + self.urls["nodes"].format(n_type, n_id)

try:
response = self.request("POST", url, jsc)
response = self.request("POST", url, json_string)
self.json_return.update({"original": response.status_code})
self.json_return.update({"parsed": response.json()})
except (OSError, RuntimeError, ZeroDivisionError, ConnectionError):
Expand Down
11 changes: 2 additions & 9 deletions pyhiveapi/apyhiveapi/api/hive_async_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,18 +213,11 @@ async def getWeather(self, weather_url):

async def setState(self, n_type, n_id, **kwargs):
"""Set the state of a Device."""
jsc = (
"{"
+ ",".join(
('"' + str(i) + '": ' '"' + str(t) + '" ' for i, t in kwargs.items())
)
+ "}"
)

json_string = json.dumps(kwargs)
url = self.urls["nodes"].format(n_type, n_id)
try:
await self.isFileBeingUsed()
await self.request("post", url, data=jsc)
await self.request("post", url, data=json_string)
except (FileInUse, OSError, RuntimeError, ConnectionError) as e:
if e.__class__.__name__ == "FileInUse":
return {"original": "file"}
Expand Down