This commit is contained in:
Paulus Schoutsen committed 2019-07-31 12:25:30 -07:00
1 parent da05dfe708
commit 4de97abc3a
2676 files changed
+163166 -140084

No files matched your search

+21 -24
View File
@@ -24,11 +24,12 @@ class HassioAPIError(RuntimeError):
def _api_bool(funct):
"""Return a boolean."""
async def _wrapper(*argv, **kwargs):
"""Wrap function."""
try:
data = await funct(*argv, **kwargs)
return data['result'] == "ok"
return data["result"] == "ok"
except HassioAPIError:
return False
@@ -37,12 +38,13 @@ def _api_bool(funct):
def _api_data(funct):
"""Return data of an api."""
async def _wrapper(*argv, **kwargs):
"""Wrap function."""
data = await funct(*argv, **kwargs)
if data['result'] == "ok":
return data['data']
raise HassioAPIError(data['message'])
if data["result"] == "ok":
return data["data"]
raise HassioAPIError(data["message"])
return _wrapper
@@ -78,8 +80,7 @@ class HassIO:
This method return a coroutine.
"""
return self.send_command(
"/addons/{}/info".format(addon), method="get")
return self.send_command("/addons/{}/info".format(addon), method="get")
@_api_data
def get_ingress_panels(self):
@@ -126,18 +127,17 @@ class HassIO:
"""Update Home Assistant API data on Hass.io."""
port = http_config.get(CONF_SERVER_PORT) or SERVER_PORT
options = {
'ssl': CONF_SSL_CERTIFICATE in http_config,
'port': port,
'watchdog': True,
'refresh_token': refresh_token,
"ssl": CONF_SSL_CERTIFICATE in http_config,
"port": port,
"watchdog": True,
"refresh_token": refresh_token,
}
if CONF_SERVER_HOST in http_config:
options['watchdog'] = False
options["watchdog"] = False
_LOGGER.warning("Don't use 'server_host' options with Hass.io")
return await self.send_command("/homeassistant/options",
payload=options)
return await self.send_command("/homeassistant/options", payload=options)
@_api_bool
def update_hass_timezone(self, timezone):
@@ -145,12 +145,9 @@ class HassIO:
This method return a coroutine.
"""
return self.send_command("/supervisor/options", payload={
'timezone': timezone
})
return self.send_command("/supervisor/options", payload={"timezone": timezone})
async def send_command(self, command, method="post", payload=None,
timeout=10):
async def send_command(self, command, method="post", payload=None, timeout=10):
"""Send API command to Hass.io.
This method is a coroutine.
@@ -158,14 +155,14 @@ class HassIO:
try:
with async_timeout.timeout(timeout):
request = await self.websession.request(
method, "http://{}{}".format(self._ip, command),
json=payload, headers={
X_HASSIO: os.environ.get('HASSIO_TOKEN', "")
})
method,
"http://{}{}".format(self._ip, command),
json=payload,
headers={X_HASSIO: os.environ.get("HASSIO_TOKEN", "")},
)
if request.status not in (200, 400):
_LOGGER.error(
"%s return code %d.", command, request.status)
_LOGGER.error("%s return code %d.", command, request.status)
raise HassioAPIError()
answer = await request.json()