From 520c6b861f0eedbb60033162b1b828524956fc1b Mon Sep 17 00:00:00 2001 From: escoand Date: Wed, 13 Nov 2019 21:19:03 +0100 Subject: [PATCH] import config to user config flow --- .../components/samsungtv/__init__.py | 2 +- .../components/samsungtv/config_flow.py | 22 +++++-------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/homeassistant/components/samsungtv/__init__.py b/homeassistant/components/samsungtv/__init__.py index 9dcf50b8155..1aaa657eea5 100644 --- a/homeassistant/components/samsungtv/__init__.py +++ b/homeassistant/components/samsungtv/__init__.py @@ -34,7 +34,7 @@ async def async_setup(hass, config): if DOMAIN in config: for entry_config in config[DOMAIN]: await hass.config_entries.flow.async_init( - DOMAIN, context={"source": "import"}, data=entry_config + DOMAIN, context={"source": "user"}, data=entry_config ) return True diff --git a/homeassistant/components/samsungtv/config_flow.py b/homeassistant/components/samsungtv/config_flow.py index 143178fbed9..fc7bbe7c34f 100644 --- a/homeassistant/components/samsungtv/config_flow.py +++ b/homeassistant/components/samsungtv/config_flow.py @@ -124,9 +124,12 @@ class SamsungTVConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): if _is_already_configured(self.hass, ip_address): return self.async_abort(reason="already_configured") - self._host = user_input[CONF_HOST] + self._host = user_input.get(CONF_HOST) self._ip = self.context[CONF_IP_ADDRESS] = ip_address - self._title = user_input[CONF_NAME] + self._mac = user_input.get(CONF_MAC) + self._port = user_input.get(CONF_PORT) + self._timeout = user_input.get(CONF_TIMEOUT) + self._title = user_input.get(CONF_NAME) result = await self.hass.async_add_executor_job( _try_connect, self._host, self._title @@ -181,18 +184,3 @@ class SamsungTVConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): return self.async_show_form( step_id="confirm", description_placeholders={"model": self._model} ) - - async def async_step_import(self, user_input): - """Handle a flow initialized by config import.""" - ip_address = await self.hass.async_add_executor_job( - _get_ip, user_input.get(CONF_HOST) - ) - - self._host = user_input.get(CONF_HOST) - self._ip = self.context[CONF_IP_ADDRESS] = ip_address - self._mac = user_input.get(CONF_MAC) - self._port = user_input.get(CONF_PORT) - self._timeout = user_input.get(CONF_TIMEOUT) - self._title = user_input.get(CONF_NAME) - - return self._get_entry()