From 0a6869891229a258ee3595265bb5286a7cf07dfd Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Sat, 24 Mar 2018 22:01:13 +0100 Subject: [PATCH] rename mode to channel --- API.md | 4 ++-- hassio/api/supervisor.py | 12 ++++++------ hassio/const.py | 8 ++++---- hassio/coresys.py | 4 ++-- hassio/updater.py | 24 ++++++++++++------------ hassio/validate.py | 8 ++++---- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/API.md b/API.md index d06c13f59..86689a9b4 100644 --- a/API.md +++ b/API.md @@ -36,7 +36,7 @@ The addons from `addons` are only installed one. "version": "INSTALL_VERSION", "last_version": "LAST_VERSION", "arch": "armhf|aarch64|i386|amd64", - "mode": "stable|beta|dev", + "channel": "stable|beta|dev", "timezone": "TIMEZONE", "wait_boot": "int", "addons": [ @@ -72,7 +72,7 @@ Optional: ```json { - "mode": "stable|beta|dev", + "channel": "stable|beta|dev", "timezone": "TIMEZONE", "wait_boot": "int", "addons_repositories": [ diff --git a/hassio/api/supervisor.py b/hassio/api/supervisor.py index d61d56b00..697d4d8bc 100644 --- a/hassio/api/supervisor.py +++ b/hassio/api/supervisor.py @@ -6,19 +6,19 @@ import voluptuous as vol from .utils import api_process, api_process_raw, api_validate from ..const import ( - ATTR_ADDONS, ATTR_VERSION, ATTR_LAST_VERSION, ATTR_MODE, ATTR_ARCH, + ATTR_ADDONS, ATTR_VERSION, ATTR_LAST_VERSION, ATTR_CHANNEL, ATTR_ARCH, HASSIO_VERSION, ATTR_ADDONS_REPOSITORIES, ATTR_LOGO, ATTR_REPOSITORY, ATTR_DESCRIPTON, ATTR_NAME, ATTR_SLUG, ATTR_INSTALLED, ATTR_TIMEZONE, ATTR_STATE, ATTR_WAIT_BOOT, ATTR_CPU_PERCENT, ATTR_MEMORY_USAGE, ATTR_MEMORY_LIMIT, ATTR_NETWORK_RX, ATTR_NETWORK_TX, ATTR_BLK_READ, ATTR_BLK_WRITE, CONTENT_TYPE_BINARY, ATTR_ICON) from ..coresys import CoreSysAttributes -from ..validate import validate_timezone, WAIT_BOOT, REPOSITORIES, MODES +from ..validate import validate_timezone, WAIT_BOOT, REPOSITORIES, CHANNELS _LOGGER = logging.getLogger(__name__) SCHEMA_OPTIONS = vol.Schema({ - vol.Optional(ATTR_MODE): MODES, + vol.Optional(ATTR_CHANNEL): CHANNELS, vol.Optional(ATTR_ADDONS_REPOSITORIES): REPOSITORIES, vol.Optional(ATTR_TIMEZONE): validate_timezone, vol.Optional(ATTR_WAIT_BOOT): WAIT_BOOT, @@ -58,7 +58,7 @@ class APISupervisor(CoreSysAttributes): return { ATTR_VERSION: HASSIO_VERSION, ATTR_LAST_VERSION: self._updater.version_hassio, - ATTR_MODE: self._updater.mode, + ATTR_CHANNEL: self._updater.channel, ATTR_ARCH: self._arch, ATTR_WAIT_BOOT: self._config.wait_boot, ATTR_TIMEZONE: self._config.timezone, @@ -71,8 +71,8 @@ class APISupervisor(CoreSysAttributes): """Set supervisor options.""" body = await api_validate(SCHEMA_OPTIONS, request) - if ATTR_MODE in body: - self._updater.mode = body[ATTR_MODE] + if ATTR_CHANNEL in body: + self._updater.mode = body[ATTR_CHANNEL] if ATTR_TIMEZONE in body: self._config.timezone = body[ATTR_TIMEZONE] diff --git a/hassio/const.py b/hassio/const.py index 11f8db5ce..b0935e4cf 100644 --- a/hassio/const.py +++ b/hassio/const.py @@ -70,7 +70,7 @@ ATTR_VERSION = 'version' ATTR_AUTO_UART = 'auto_uart' ATTR_LAST_BOOT = 'last_boot' ATTR_LAST_VERSION = 'last_version' -ATTR_MODE = 'mode' +ATTR_CHANNEL = 'channel' ATTR_NAME = 'name' ATTR_SLUG = 'slug' ATTR_DESCRIPTON = 'description' @@ -186,9 +186,9 @@ ARCH_AARCH64 = 'aarch64' ARCH_AMD64 = 'amd64' ARCH_I386 = 'i386' -MODE_STABLE = 'stable' -MODE_BETA = 'beta' -MODE_DEV = 'dev' +CHANNEL_STABLE = 'stable' +CHANNEL_BETA = 'beta' +CHANNEL_DEV = 'dev' REPOSITORY_CORE = 'core' REPOSITORY_LOCAL = 'local' diff --git a/hassio/coresys.py b/hassio/coresys.py index c099044ad..79a9a9047 100644 --- a/hassio/coresys.py +++ b/hassio/coresys.py @@ -2,7 +2,7 @@ import aiohttp -from .const import MODE_DEV +from .const import CHANNEL_DEV from .config import CoreConfig from .docker import DockerAPI from .misc.dns import DNSForward @@ -53,7 +53,7 @@ class CoreSys(object): @property def dev(self): """Return True if we run dev modus.""" - return self._updater.mode == MODE_DEV + return self._updater.channel == CHANNEL_DEV @property def loop(self): diff --git a/hassio/updater.py b/hassio/updater.py index a3fdc57a5..d879e0482 100644 --- a/hassio/updater.py +++ b/hassio/updater.py @@ -9,7 +9,7 @@ import async_timeout from .const import ( URL_HASSIO_VERSION, FILE_HASSIO_UPDATER, ATTR_HOMEASSISTANT, ATTR_HASSIO, - ATTR_MODE, MODE_STABLE, MODE_BETA, MODE_DEV) + ATTR_CHANNEL, CHANNEL_STABLE, CHANNEL_BETA, CHANNEL_DEV) from .coresys import CoreSysAttributes from .utils import AsyncThrottle from .utils.json import JsonConfig @@ -17,10 +17,10 @@ from .validate import SCHEMA_UPDATER_CONFIG _LOGGER = logging.getLogger(__name__) -MODE_TO_BRANCH = { - MODE_STABLE: 'master', - MODE_BETA: 'rc', - MODE_DEV: 'dev', +CHANNEL_TO_BRANCH = { + CHANNEL_STABLE: 'master', + CHANNEL_BETA: 'rc', + CHANNEL_DEV: 'dev', } @@ -50,14 +50,14 @@ class Updater(JsonConfig, CoreSysAttributes): return self._data.get(ATTR_HASSIO) @property - def mode(self): - """Return upstream mode of hassio instance.""" - return self._data[ATTR_MODE] + def channel(self): + """Return upstream channel of hassio instance.""" + return self._data[ATTR_CHANNEL] - @mode.setter - def mode(self, value): + @channel.setter + def channel(self, value): """Set upstream mode.""" - self._data[ATTR_MODE] = value + self._data[ATTR_CHANNEL] = value @AsyncThrottle(timedelta(seconds=60)) async def reload(self): @@ -65,7 +65,7 @@ class Updater(JsonConfig, CoreSysAttributes): Is a coroutine. """ - url = URL_HASSIO_VERSION.format(MODE_TO_BRANCH[self.mode]) + url = URL_HASSIO_VERSION.format(CHANNEL_TO_BRANCH[self.mode]) try: _LOGGER.info("Fetch update data from %s", url) with async_timeout.timeout(10, loop=self._loop): diff --git a/hassio/validate.py b/hassio/validate.py index a10242bbe..05d23cac6 100644 --- a/hassio/validate.py +++ b/hassio/validate.py @@ -6,11 +6,11 @@ import voluptuous as vol import pytz from .const import ( - ATTR_IMAGE, ATTR_LAST_VERSION, ATTR_MODE, ATTR_TIMEZONE, + ATTR_IMAGE, ATTR_LAST_VERSION, ATTR_CHANNEL, ATTR_TIMEZONE, ATTR_ADDONS_CUSTOM_LIST, ATTR_AUDIO_OUTPUT, ATTR_AUDIO_INPUT, ATTR_PASSWORD, ATTR_HOMEASSISTANT, ATTR_HASSIO, ATTR_BOOT, ATTR_LAST_BOOT, ATTR_SSL, ATTR_PORT, ATTR_WATCHDOG, ATTR_WAIT_BOOT, ATTR_UUID, - MODE_STABLE, MODE_BETA, MODE_DEV) + CHANNEL_STABLE, CHANNEL_BETA, CHANNEL_DEV) RE_REPOSITORY = re.compile(r"^(?P[^#]+)(?:#(?P[\w\-]+))?$") @@ -19,7 +19,7 @@ NETWORK_PORT = vol.All(vol.Coerce(int), vol.Range(min=1, max=65535)) ALSA_CHANNEL = vol.Match(r"\d+,\d+") WAIT_BOOT = vol.All(vol.Coerce(int), vol.Range(min=1, max=60)) DOCKER_IMAGE = vol.Match(r"^[\w{}]+/[\-\w{}]+$") -MODES = vol.In([MODE_STABLE, MODE_BETA, MODE_DEV]) +CHANNELS = vol.In([CHANNEL_STABLE, CHANNEL_BETA, CHANNEL_DEV]) def validate_repository(repository): @@ -97,7 +97,7 @@ SCHEMA_HASS_CONFIG = vol.Schema({ SCHEMA_UPDATER_CONFIG = vol.Schema({ - vol.Optional(ATTR_MODE, default=MODE_STABLE): MODES, + vol.Optional(ATTR_CHANNEL, default=CHANNEL_STABLE): CHANNELS, vol.Optional(ATTR_HOMEASSISTANT): vol.Coerce(str), vol.Optional(ATTR_HASSIO): vol.Coerce(str), }, extra=vol.REMOVE_EXTRA)