TelldusLive config flow

homeassistant/components/binary_sensor/tellduslive.py

@@ -9,22 +9,35 @@
 """
 import logging
 
-from homeassistant.components import tellduslive
+from homeassistant.components import binary_sensor, tellduslive
 from homeassistant.components.binary_sensor import BinarySensorDevice
 from homeassistant.components.tellduslive.entry import TelldusLiveEntity
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 _LOGGER = logging.getLogger(__name__)
 
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up Tellstick sensors."""
-    if discovery_info is None:
-        return
-    client = hass.data[tellduslive.DOMAIN]
-    add_entities(
-        TelldusLiveSensor(client, binary_sensor)
-        for binary_sensor in discovery_info
-    )
+    """Old way of setting up TelldusLive.
+
+    Can only be called when a user accidentally mentions the platform in their
+    config. But even in that case it would have been ignored.
+    """
+    pass
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up tellduslive sensors dynamically."""
+    async def async_discover_binary_sensor(device_id):
+        """Discover and add a discovered sensor."""
+        client = hass.data[tellduslive.DOMAIN]
+        async_add_entities([TelldusLiveSensor(client, device_id)])
+
+    async_dispatcher_connect(
+        hass,
+        tellduslive.TELLDUS_DISCOVERY_NEW.format(binary_sensor.DOMAIN,
+                                                 tellduslive.DOMAIN),
+        async_discover_binary_sensor)
 
 
 class TelldusLiveSensor(TelldusLiveEntity, BinarySensorDevice):

homeassistant/components/cover/tellduslive.py

@@ -8,20 +8,36 @@
 """
 import logging
 
-from homeassistant.components import tellduslive
+from homeassistant.components import cover, tellduslive
 from homeassistant.components.cover import CoverDevice
 from homeassistant.components.tellduslive.entry import TelldusLiveEntity
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 _LOGGER = logging.getLogger(__name__)
 
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the Telldus Live covers."""
-    if discovery_info is None:
-        return
-
-    client = hass.data[tellduslive.DOMAIN]
-    add_entities(TelldusLiveCover(client, cover) for cover in discovery_info)
+    """Old way of setting up TelldusLive.
+
+    Can only be called when a user accidentally mentions the platform in their
+    config. But even in that case it would have been ignored.
+    """
+    pass
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up tellduslive sensors dynamically."""
+    async def async_discover_cover(device_id):
+        """Discover and add a discovered sensor."""
+        client = hass.data[tellduslive.DOMAIN]
+        async_add_entities([TelldusLiveCover(client, device_id)])
+
+    async_dispatcher_connect(
+        hass,
+        tellduslive.TELLDUS_DISCOVERY_NEW.format(cover.DOMAIN,
+                                                 tellduslive.DOMAIN),
+        async_discover_cover,
+    )
 
 
 class TelldusLiveCover(TelldusLiveEntity, CoverDevice):

homeassistant/components/discovery.py

@@ -49,6 +49,7 @@
     SERVICE_DECONZ: 'deconz',
     'google_cast': 'cast',
     SERVICE_HUE: 'hue',
+    SERVICE_TELLDUSLIVE: 'tellduslive',
     SERVICE_IKEA_TRADFRI: 'tradfri',
     'sonos': 'sonos',
 }
@@ -62,7 +63,6 @@
     SERVICE_APPLE_TV: ('apple_tv', None),
     SERVICE_WINK: ('wink', None),
     SERVICE_XIAOMI_GW: ('xiaomi_aqara', None),
-    SERVICE_TELLDUSLIVE: ('tellduslive', None),
     SERVICE_DAIKIN: ('daikin', None),
     SERVICE_SABNZBD: ('sabnzbd', None),
     SERVICE_SAMSUNG_PRINTER: ('sensor', 'syncthru'),

homeassistant/components/light/tellduslive.py

@@ -8,20 +8,37 @@
 """
 import logging
 
-from homeassistant.components import tellduslive
+from homeassistant.components import light, tellduslive
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS, SUPPORT_BRIGHTNESS, Light)
 from homeassistant.components.tellduslive.entry import TelldusLiveEntity
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 _LOGGER = logging.getLogger(__name__)
 
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the Tellstick Net lights."""
-    if discovery_info is None:
-        return
-    client = hass.data[tellduslive.DOMAIN]
-    add_entities(TelldusLiveLight(client, light) for light in discovery_info)
+    """Old way of setting up TelldusLive.
+
+    Can only be called when a user accidentally mentions the platform in their
+    config. But even in that case it would have been ignored.
+    """
+    pass
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up tellduslive sensors dynamically."""
+    async def async_discover_light(device_id):
+        """Discover and add a discovered sensor."""
+        client = hass.data[tellduslive.DOMAIN]
+        async_add_entities([TelldusLiveLight(client, device_id)])
+
+    async_dispatcher_connect(
+        hass,
+        tellduslive.TELLDUS_DISCOVERY_NEW.format(light.DOMAIN,
+                                                 tellduslive.DOMAIN),
+        async_discover_light,
+    )
 
 
 class TelldusLiveLight(TelldusLiveEntity, Light):

homeassistant/components/sensor/tellduslive.py

@@ -6,11 +6,12 @@
 """
 import logging
 
-from homeassistant.components import tellduslive
+from homeassistant.components import sensor, tellduslive
 from homeassistant.components.tellduslive.entry import TelldusLiveEntity
 from homeassistant.const import (
     DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_ILLUMINANCE, DEVICE_CLASS_TEMPERATURE,
     TEMP_CELSIUS)
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -46,12 +47,25 @@
 
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the Tellstick sensors."""
-    if discovery_info is None:
-        return
-    client = hass.data[tellduslive.DOMAIN]
-    add_entities(
-        TelldusLiveSensor(client, sensor) for sensor in discovery_info)
+    """Old way of setting up TelldusLive.
+
+    Can only be called when a user accidentally mentions the platform in their
+    config. But even in that case it would have been ignored.
+    """
+    pass
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up tellduslive sensors dynamically."""
+    async def async_discover_sensor(device_id):
+        """Discover and add a discovered sensor."""
+        client = hass.data[tellduslive.DOMAIN]
+        async_add_entities([TelldusLiveSensor(client, device_id)])
+
+    async_dispatcher_connect(
+        hass,
+        tellduslive.TELLDUS_DISCOVERY_NEW.format(
+            sensor.DOMAIN, tellduslive.DOMAIN), async_discover_sensor)
 
 
 class TelldusLiveSensor(TelldusLiveEntity):

homeassistant/components/switch/tellduslive.py

@@ -9,20 +9,36 @@
 """
 import logging
 
-from homeassistant.components import tellduslive
+from homeassistant.components import switch, tellduslive
 from homeassistant.components.tellduslive.entry import TelldusLiveEntity
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import ToggleEntity
 
 _LOGGER = logging.getLogger(__name__)
 
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up Tellstick switches."""
-    if discovery_info is None:
-        return
-    client = hass.data[tellduslive.DOMAIN]
-    add_entities(
-        TelldusLiveSwitch(client, switch) for switch in discovery_info)
+    """Old way of setting up TelldusLive.
+
+    Can only be called when a user accidentally mentions the platform in their
+    config. But even in that case it would have been ignored.
+    """
+    pass
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up tellduslive sensors dynamically."""
+    async def async_discover_switch(device_id):
+        """Discover and add a discovered sensor."""
+        client = hass.data[tellduslive.DOMAIN]
+        async_add_entities([TelldusLiveSwitch(client, device_id)])
+
+    async_dispatcher_connect(
+        hass,
+        tellduslive.TELLDUS_DISCOVERY_NEW.format(switch.DOMAIN,
+                                                 tellduslive.DOMAIN),
+        async_discover_switch,
+    )
 
 
 class TelldusLiveSwitch(TelldusLiveEntity, ToggleEntity):

homeassistant/components/tellduslive/.translations/en.json

@@ -0,0 +1,24 @@
+{
+    "config": {
+      "title": "Telldus Live",
+      "step": {
+        "user": {
+          "title": "Pick endpoint.",
+          "description": "",
+          "data": {
+            "host": "Host"
+          }
+        },
+        "auth": {
+            "title": "Authenticate against TelldusLive",
+            "description": "To link your TelldusLive account:\n 1. Click the link below\n 2. Login to Telldus Live\n 3. Authorize **{app_name}** (click **Yes**).\n 4. Come back here and click **SUBMIT**.\n\n [Link TelldusLive account]({auth_url})"
+        }
+      },
+      "abort": {
+        "authorize_url_timeout": "Timeout generating authorize url.",
+        "authorize_url_fail": "Unknown error generating an authorize url.",
+        "all_configured": "TelldusLive is already configured",
+        "unknown": "Unknown error occurred"
+      }
+    }
+  }