HEOS confirm discovered devices before adding (#23063)

* Add host selection step to discovery

* Review feedback

* Fix failing test
This commit is contained in:
Andrew Sayre authored and GitHub committed 2019-04-13 16:44:45 -05:00
1 parent 46ee7d7b22
commit 8c89e260df
4 files changed
+67 -49

No files matched your search

+22 -15
View File
@@ -4,9 +4,9 @@ import asyncio
import voluptuous as vol
from homeassistant import config_entries
from homeassistant.const import CONF_HOST
from homeassistant.const import CONF_HOST, CONF_NAME
from .const import DOMAIN
from .const import DATA_DISCOVERED_HOSTS, DOMAIN
def format_title(host: str) -> str:
@@ -23,13 +23,17 @@ class HeosFlowHandler(config_entries.ConfigFlow):
async def async_step_discovery(self, discovery_info):
"""Handle a discovered Heos device."""
# Only continue if this is the only active flow
flows = self.hass.config_entries.flow.async_progress()
heos_flows = [flow for flow in flows if flow['handler'] == DOMAIN]
if len(heos_flows) == 1:
return await self.async_step_user(
{CONF_HOST: discovery_info[CONF_HOST]})
return self.async_abort(reason='already_setup')
# Store discovered host
friendly_name = "{} ({})".format(
discovery_info[CONF_NAME], discovery_info[CONF_HOST])
self.hass.data.setdefault(DATA_DISCOVERED_HOSTS, {})
self.hass.data[DATA_DISCOVERED_HOSTS][friendly_name] \
= discovery_info[CONF_HOST]
# Abort if other flows in progress or an entry already exists
if self._async_in_progress() or self._async_current_entries():
return self.async_abort(reason='already_setup')
# Show selection form
return self.async_show_form(step_id='user')
async def async_step_import(self, user_input=None):
"""Occurs when an entry is setup through config."""
@@ -41,30 +45,33 @@ class HeosFlowHandler(config_entries.ConfigFlow):
async def async_step_user(self, user_input=None):
"""Obtain host and validate connection."""
from pyheos import Heos
self.hass.data.setdefault(DATA_DISCOVERED_HOSTS, {})
# Only a single entry is needed for all devices
entries = self.hass.config_entries.async_entries(DOMAIN)
if entries:
if self._async_current_entries():
return self.async_abort(reason='already_setup')
# Try connecting to host if provided
errors = {}
host = None
if user_input is not None:
host = user_input[CONF_HOST]
# Map host from friendly name if in discovered hosts
host = self.hass.data[DATA_DISCOVERED_HOSTS].get(host, host)
heos = Heos(host)
try:
await heos.connect()
return await self.async_step_import(user_input)
self.hass.data.pop(DATA_DISCOVERED_HOSTS)
return await self.async_step_import({CONF_HOST: host})
except (asyncio.TimeoutError, ConnectionError):
errors[CONF_HOST] = 'connection_failure'
finally:
await heos.disconnect()
# Return form
host_type = str if not self.hass.data[DATA_DISCOVERED_HOSTS] \
else vol.In(list(self.hass.data[DATA_DISCOVERED_HOSTS]))
return self.async_show_form(
step_id='user',
data_schema=vol.Schema({
vol.Required(CONF_HOST, default=host): str
vol.Required(CONF_HOST, default=host): host_type
}),
errors=errors)