home-assistant/core
1
0
Fork 1
mirror of https://github.com/home-assistant/core.git synced 2025-08-04 21:25:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

use upstream checks

Browse Source
This commit is contained in:
escoand
2020-01-03 11:33:31 +01:00
parent 5a77dcdd3d
commit d5513b5707
1 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
homeassistant/components/samsungtv/config_flow.py
View File

@@ -38,24 +38,13 @@ RESULT_NOT_FOUND = "not_found"
RESULT_NOT_SUPPORTED = "not_supported" RESULT_NOT_SUPPORTED = "not_supported"
def _is_already_in_progress(flows, ip_address):
return any(ip_address == flow["context"].get(CONF_IP_ADDRESS) for flow in flows)
def _is_already_configured(hass, ip_address):
return any(
ip_address == entry.data.get(CONF_IP_ADDRESS)
for entry in hass.config_entries.async_entries(DOMAIN)
)
def _get_ip(host): def _get_ip(host):
if host is None: if host is None:
return None return None
return socket.gethostbyname(host) return socket.gethostbyname(host)
def _try_connect(host, name): def _try_connect(host, name, port=None):
"""Try to connect and check auth.""" """Try to connect and check auth."""
for method in METHODS: for method in METHODS:
config = { config = {
@@ -64,7 +53,7 @@ def _try_connect(host, name):
"id": "ha.component.samsung", "id": "ha.component.samsung",
"host": host, "host": host,
"method": method, "method": method,
"port": None, "port": port,
"timeout": None, "timeout": None,
} }
try: try:
@@ -122,6 +111,9 @@ class SamsungTVConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
async def async_step_import(self, user_input=None): async def async_step_import(self, user_input=None):
"""Handle configuration by yaml file.""" """Handle configuration by yaml file."""
self._on_script = user_input.get(CONF_ON_ACTION)
self._port = user_input.get(CONF_PORT)
return await self.async_step_user(user_input) return await self.async_step_user(user_input)
async def async_step_user(self, user_input=None): async def async_step_user(self, user_input=None):
@@ -131,20 +123,15 @@ class SamsungTVConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
_get_ip, user_input[CONF_HOST] _get_ip, user_input[CONF_HOST]
) )
if _is_already_in_progress(self._async_in_progress(), ip_address): self.async_set_unique_id(ip_address);
return self.async_abort(reason="already_in_progress") self._abort_if_unique_id_configured();
if _is_already_configured(self.hass, ip_address):
return self.async_abort(reason="already_configured")
self._host = user_input.get(CONF_HOST) self._host = user_input.get(CONF_HOST)
self._ip = self.context[CONF_IP_ADDRESS] = ip_address self._ip = self.context[CONF_IP_ADDRESS] = ip_address
self._on_script = user_input.get(CONF_ON_ACTION)
self._port = user_input.get(CONF_PORT)
self._title = user_input.get(CONF_NAME) self._title = user_input.get(CONF_NAME)
result = await self.hass.async_add_executor_job( result = await self.hass.async_add_executor_job(
_try_connect, self._host, self._title _try_connect, self._host, self._title, self._port
) )
if result != RESULT_SUCCESS: if result != RESULT_SUCCESS:
@@ -159,11 +146,8 @@ class SamsungTVConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
_get_ip, user_input[ATTR_SSDP_LOCATION] _get_ip, user_input[ATTR_SSDP_LOCATION]
) )
if _is_already_in_progress(self._async_in_progress(), ip_address): self.async_set_unique_id(ip_address);
return self.async_abort(reason="already_in_progress") self._abort_if_unique_id_configured();
if _is_already_configured(self.hass, ip_address):
return self.async_abort(reason="already_configured")
self._host = user_input[ATTR_SSDP_LOCATION] self._host = user_input[ATTR_SSDP_LOCATION]
self._ip = self.context[CONF_IP_ADDRESS] = ip_address self._ip = self.context[CONF_IP_ADDRESS] = ip_address