Fix merge conflicts

This commit is contained in:
Pascal Vizeli 2017-05-24 00:07:49 +02:00
commit abd9683e11
5 changed files with 27 additions and 4 deletions

View File

@ -207,6 +207,10 @@ class AddonManager(AddonsData):
_LOGGER.error("No docker found for addon %s", addon)
return False
if not self.write_addon_options(addon):
_LOGGER.error("Can't write options for addon %s", addon)
return False
return await self.dockers[addon].restart()
async def logs(self, addon):

View File

@ -1,7 +1,7 @@
"""Const file for HassIO."""
from pathlib import Path
HASSIO_VERSION = '0.32'
HASSIO_VERSION = '0.33'
URL_HASSIO_VERSION = ('https://raw.githubusercontent.com/home-assistant/'
'hassio/master/version.json')

View File

@ -20,7 +20,7 @@ from .dock.supervisor import DockerSupervisor
from .tasks import (
hassio_update, homeassistant_watchdog, homeassistant_setup,
api_sessions_cleanup)
from .tools import get_arch_from_image, get_local_ip
from .tools import get_arch_from_image, get_local_ip, fetch_timezone
_LOGGER = logging.getLogger(__name__)
@ -60,13 +60,17 @@ class HassIO(object):
# set api endpoint
self.config.api_endpoint = await get_local_ip(self.loop)
# update timezone
if self.config.timezone == 'UTC':
self.config.timezone = await fetch_timezone(self.websession)
# hostcontrol
await self.host_control.load()
# schedule update info tasks
self.scheduler.register_task(
self.host_control.load, RUN_UPDATE_INFO_TASKS)
self.host_control.load, RUN_UPDATE_INFO_TASKS)
# rest api views
self.api.register_host(self.host_control)
self.api.register_network(self.host_control)

View File

@ -1,5 +1,6 @@
"""Tools file for HassIO."""
import asyncio
from contextlib import suppress
import json
import logging
import re
@ -14,6 +15,8 @@ from .const import URL_HASSIO_VERSION, URL_HASSIO_VERSION_BETA
_LOGGER = logging.getLogger(__name__)
FREEGEOIP_URL = "https://freegeoip.io/json/"
_RE_VERSION = re.compile(r"VERSION=(.*)")
_IMAGE_ARCH = re.compile(r".*/([a-z0-9]*)-hassio-supervisor")
@ -105,3 +108,15 @@ def validate_timezone(timezone):
from None
return timezone
async def fetch_timezone(websession):
"""Read timezone from freegeoip."""
data = {}
with suppress(aiohttp.ClientError, asyncio.TimeoutError,
json.JSONDecodeError, KeyError):
with async_timeout.timeout(10, loop=websession.loop):
async with websession.get(FREEGEOIP_URL) as request:
data = await request.json()
return data.get('time_zone', 'UTC')

View File

@ -1,5 +1,5 @@
{
"hassio": "0.32",
"hassio": "0.33",
"homeassistant": "0.45.1",
"resinos": "0.8",
"resinhup": "0.1",