From 0273fc5cf36cef22f2611a5606c10442d1f401e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=BChnel?= Date: Thu, 8 Feb 2018 22:01:06 +0100 Subject: [PATCH 1/3] removed default configuration, added warning if no sensor was configured --- .../components/sensor/alpha_vantage.py | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/homeassistant/components/sensor/alpha_vantage.py b/homeassistant/components/sensor/alpha_vantage.py index 6b224492ffbf67..204c31b25bd62b 100644 --- a/homeassistant/components/sensor/alpha_vantage.py +++ b/homeassistant/components/sensor/alpha_vantage.py @@ -31,18 +31,6 @@ CONF_SYMBOLS = 'symbols' CONF_TO = 'to' -DEFAULT_SYMBOL = { - CONF_CURRENCY: 'USD', - CONF_NAME: 'Google', - CONF_SYMBOL: 'GOOGL', -} - -DEFAULT_CURRENCY = { - CONF_FROM: 'BTC', - CONF_NAME: 'Bitcon', - CONF_TO: 'USD', -} - ICONS = { 'BTC': 'mdi:currency-btc', 'EUR': 'mdi:currency-eur', @@ -69,9 +57,9 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ vol.Required(CONF_API_KEY): cv.string, - vol.Optional(CONF_FOREIGN_EXCHANGE, default=[DEFAULT_CURRENCY]): + vol.Optional(CONF_FOREIGN_EXCHANGE): vol.All(cv.ensure_list, [CURRENCY_SCHEMA]), - vol.Optional(CONF_SYMBOLS, default=[DEFAULT_SYMBOL]): + vol.Optional(CONF_SYMBOLS): vol.All(cv.ensure_list, [SYMBOL_SCHEMA]), }) @@ -83,6 +71,15 @@ def setup_platform(hass, config, add_devices, discovery_info=None): api_key = config.get(CONF_API_KEY) symbols = config.get(CONF_SYMBOLS) + conversions = config.get(CONF_FOREIGN_EXCHANGE) + + if (symbols is None or len(symbols) == 0) and \ + (conversions is None or len(conversions) == 0): + msg = 'Warning: No symbols or currencies configured.' + hass.components.persistent_notification.create( + msg, 'Sensor alpha_vantage') + _LOGGER.warning(msg) + return timeseries = TimeSeries(key=api_key) @@ -98,7 +95,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None): dev.append(AlphaVantageSensor(timeseries, symbol)) forex = ForeignExchange(key=api_key) - for conversion in config.get(CONF_FOREIGN_EXCHANGE): + for conversion in conversions: from_cur = conversion.get(CONF_FROM) to_cur = conversion.get(CONF_TO) try: From 154883097e6eea299e93335613c811357db26507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=BChnel?= Date: Fri, 9 Feb 2018 20:55:40 +0100 Subject: [PATCH 2/3] fixed typo in currency-try icon --- homeassistant/components/sensor/alpha_vantage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homeassistant/components/sensor/alpha_vantage.py b/homeassistant/components/sensor/alpha_vantage.py index 204c31b25bd62b..87573c0d0364b9 100644 --- a/homeassistant/components/sensor/alpha_vantage.py +++ b/homeassistant/components/sensor/alpha_vantage.py @@ -37,7 +37,7 @@ 'GBP': 'mdi:currency-gbp', 'INR': 'mdi:currency-inr', 'RUB': 'mdi:currency-rub', - 'TRY': 'mdi: currency-try', + 'TRY': 'mdi:currency-try', 'USD': 'mdi:currency-usd', } From e40bd37d275798358979d54a78b6e979b5ef452d Mon Sep 17 00:00:00 2001 From: ChristianKuehnel Date: Sat, 10 Feb 2018 19:16:22 +0100 Subject: [PATCH 3/3] changed if statement --- homeassistant/components/sensor/alpha_vantage.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/homeassistant/components/sensor/alpha_vantage.py b/homeassistant/components/sensor/alpha_vantage.py index 87573c0d0364b9..fce82f7eda5fe6 100644 --- a/homeassistant/components/sensor/alpha_vantage.py +++ b/homeassistant/components/sensor/alpha_vantage.py @@ -73,8 +73,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None): symbols = config.get(CONF_SYMBOLS) conversions = config.get(CONF_FOREIGN_EXCHANGE) - if (symbols is None or len(symbols) == 0) and \ - (conversions is None or len(conversions) == 0): + if not symbols and not conversions: msg = 'Warning: No symbols or currencies configured.' hass.components.persistent_notification.create( msg, 'Sensor alpha_vantage')