From 1b73bcbff78c510838a98b7cf63fd24c49ff3b9c Mon Sep 17 00:00:00 2001 From: Xiaonan Shen Date: Wed, 29 Jul 2020 07:49:43 +0800 Subject: [PATCH] Fix songpal already configured check in config flow (#37813) * Fix already configured check * Mark endpoint duplicate check as callback --- homeassistant/components/songpal/config_flow.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/homeassistant/components/songpal/config_flow.py b/homeassistant/components/songpal/config_flow.py index 96e1e7ed7df..9acbedd11c7 100644 --- a/homeassistant/components/songpal/config_flow.py +++ b/homeassistant/components/songpal/config_flow.py @@ -9,6 +9,7 @@ import voluptuous as vol from homeassistant import config_entries from homeassistant.components import ssdp from homeassistant.const import CONF_HOST, CONF_NAME +from homeassistant.core import callback from .const import CONF_ENDPOINT, DOMAIN # pylint: disable=unused-import @@ -74,7 +75,7 @@ class SongpalConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): async def async_step_init(self, user_input=None): """Handle a flow start.""" # Check if already configured - if self._endpoint_already_configured(): + if self._async_endpoint_already_configured(): return self.async_abort(reason="already_configured") if user_input is None: @@ -145,9 +146,10 @@ class SongpalConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): return await self.async_step_init(user_input) - def _endpoint_already_configured(self): + @callback + def _async_endpoint_already_configured(self): """See if we already have an endpoint matching user input configured.""" - existing_endpoints = [ - entry.data[CONF_ENDPOINT] for entry in self._async_current_entries() - ] - return self.conf.endpoint in existing_endpoints + for entry in self._async_current_entries(): + if entry.data.get(CONF_ENDPOINT) == self.conf.endpoint: + return True + return False