Fix last lint

This commit is contained in:
pvizeli 2017-03-27 14:44:08 +02:00
parent 285822b951
commit 490ea547f9
3 changed files with 54 additions and 44 deletions

View File

@ -2,55 +2,18 @@
import asyncio import asyncio
import logging import logging
import aiohttp
import docker
import hassio.bootstrap as bootstrap import hassio.bootstrap as bootstrap
import hassio.tools as tools import hassio.core as core
from hassio.const import CONF_HOMEASSISTANT_TAG
from hassio.docker.homeassistant import DockerHomeAssistant
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
async def main(loop): if __name__ == "__main__":
"""Start HassIO."""
bootstrap.initialize_logging() bootstrap.initialize_logging()
# init asyncio & aiohttp client
websession = aiohttp.ClientSession(loop=loop)
dock = docker.Client(base_url='unix://var/run/docker.sock', version='auto')
# init system
config = bootstrap.initialize_system_data()
# init HomeAssistant Docker
docker_hass = DockerHomeAssistant(
config, loop, dock, config.homeassistant_image,
config.homeassistant_tag
)
# first start of supervisor?
if config.homeassistant_tag is None:
_LOGGER.info("First start of supervisor, read version from github.")
# read homeassistant tag and install it
current = None
while True:
current = await tools.fetch_current_versions(websession)
if current and CONF_HOMEASSISTANT_TAG in current:
if await docker_hass.install(current[CONF_HOMEASSISTANT_TAG]):
break
_LOGGER.warning("Can't fetch info from github. Retry in 60")
await asyncio.sleep(60, loop=loop)
config.homeassistant_tag = current[CONF_HOMEASSISTANT_TAG]
# run HomeAssistant
await docker_hass.run()
if __name__ == "__main__":
loop = asyncio.get_event_loop() loop = asyncio.get_event_loop()
loop.create_task(main(loop)) _LOGGER.info("Start Hassio task")
loop.create_task(core.run_hassio(loop))
loop.run_forever() loop.run_forever()
_LOGGER.info("Close Hassio")

47
hassio_api/hassio/core.py Normal file
View File

@ -0,0 +1,47 @@
"""Main file for HassIO."""
import asyncio
import logging
import aiohttp
import docker
import .bootstrap
import .tools
from .const import CONF_HOMEASSISTANT_TAG
from .docker.homeassistant import DockerHomeAssistant
_LOGGER = logging.getLogger(__name__)
async def run_hassio(loop):
"""Start HassIO."""
websession = aiohttp.ClientSession(loop=loop)
dock = docker.Client(base_url='unix://var/run/docker.sock', version='auto')
# init system
config = bootstrap.initialize_system_data()
# init HomeAssistant Docker
docker_hass = DockerHomeAssistant(
config, loop, dock, config.homeassistant_image,
config.homeassistant_tag
)
# first start of supervisor?
if config.homeassistant_tag is None:
_LOGGER.info("First start of supervisor, read version from github.")
# read homeassistant tag and install it
current = None
while True:
current = await tools.fetch_current_versions(websession)
if current and CONF_HOMEASSISTANT_TAG in current:
if await docker_hass.install(current[CONF_HOMEASSISTANT_TAG]):
break
_LOGGER.warning("Can't fetch info from github. Retry in 60")
await asyncio.sleep(60, loop=loop)
config.homeassistant_tag = current[CONF_HOMEASSISTANT_TAG]
# run HomeAssistant
await docker_hass.run()

View File

@ -1,6 +1,6 @@
from setuptools import setup from setuptools import setup
VERSION = "1.5" VERSION = "0.1"
setup( setup(
name='HassIO', name='HassIO',