mirror of
https://github.com/home-assistant/core.git
synced 2025-04-26 10:17:51 +00:00
Use ConfigFlow.has_matching_flow to deduplicate elkm1 flows (#126887)
This commit is contained in:
parent
fcbb9dd8d8
commit
2b2f5c9353
@ -3,7 +3,7 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
from typing import Any
|
from typing import Any, Self
|
||||||
|
|
||||||
from elkm1_lib.discovery import ElkSystem
|
from elkm1_lib.discovery import ElkSystem
|
||||||
from elkm1_lib.elk import Elk
|
from elkm1_lib.elk import Elk
|
||||||
@ -132,6 +132,8 @@ class Elkm1ConfigFlow(ConfigFlow, domain=DOMAIN):
|
|||||||
|
|
||||||
VERSION = 1
|
VERSION = 1
|
||||||
|
|
||||||
|
host: str | None = None
|
||||||
|
|
||||||
def __init__(self) -> None:
|
def __init__(self) -> None:
|
||||||
"""Initialize the elkm1 config flow."""
|
"""Initialize the elkm1 config flow."""
|
||||||
self._discovered_device: ElkSystem | None = None
|
self._discovered_device: ElkSystem | None = None
|
||||||
@ -176,10 +178,9 @@ class Elkm1ConfigFlow(ConfigFlow, domain=DOMAIN):
|
|||||||
if async_update_entry_from_discovery(self.hass, entry, device):
|
if async_update_entry_from_discovery(self.hass, entry, device):
|
||||||
self.hass.config_entries.async_schedule_reload(entry.entry_id)
|
self.hass.config_entries.async_schedule_reload(entry.entry_id)
|
||||||
return self.async_abort(reason="already_configured")
|
return self.async_abort(reason="already_configured")
|
||||||
self.context[CONF_HOST] = host
|
self.host = host
|
||||||
for progress in self._async_in_progress():
|
if self.hass.config_entries.flow.async_has_matching_flow(self):
|
||||||
if progress.get("context", {}).get(CONF_HOST) == host:
|
return self.async_abort(reason="already_in_progress")
|
||||||
return self.async_abort(reason="already_in_progress")
|
|
||||||
# Handled ignored case since _async_current_entries
|
# Handled ignored case since _async_current_entries
|
||||||
# is called with include_ignore=False
|
# is called with include_ignore=False
|
||||||
self._abort_if_unique_id_configured()
|
self._abort_if_unique_id_configured()
|
||||||
@ -190,6 +191,10 @@ class Elkm1ConfigFlow(ConfigFlow, domain=DOMAIN):
|
|||||||
return self.async_abort(reason="cannot_connect")
|
return self.async_abort(reason="cannot_connect")
|
||||||
return await self.async_step_discovery_confirm()
|
return await self.async_step_discovery_confirm()
|
||||||
|
|
||||||
|
def is_matching(self, other_flow: Self) -> bool:
|
||||||
|
"""Return True if other_flow is matching this flow."""
|
||||||
|
return other_flow.host == self.host
|
||||||
|
|
||||||
async def async_step_discovery_confirm(
|
async def async_step_discovery_confirm(
|
||||||
self, user_input: dict[str, Any] | None = None
|
self, user_input: dict[str, Any] | None = None
|
||||||
) -> ConfigFlowResult:
|
) -> ConfigFlowResult:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user