remote/adaptive-lighting
1
0
Fork 0
mirror of https://github.com/basnijholt/adaptive-lighting.git synced 2026-09-13 07:14:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Delete AdaptiveLighting instances that have been removed from YAML (#669)

Browse source 
* Do not re-add already added configs

* Use async_remove
This commit is contained in:
Bas Nijholt 2023-07-26 23:40:54 -07:00 • committed by GitHub
commit c64d9cefbe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
custom_components/adaptive_lighting/config_flow.py
View file

@ -40,10 +40,13 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
)
async def async_step_import(self, user_input=None):
"""Handle configuration by yaml file."""
"""Handle configuration by YAML file."""
await self.async_set_unique_id(user_input[CONF_NAME])
for entry in self._async_current_entries():
if entry.unique_id == self.unique_id:
# Keep a list of switches that are configured via YAML
data = self.hass.data.setdefault(DOMAIN, {})
data.setdefault("__yaml__", []).append(self.unique_id)
self.hass.config_entries.async_update_entry(entry, data=user_input)
self._abort_if_unique_id_configured()
return self.async_create_entry(title=user_input[CONF_NAME], data=user_input)

17
custom_components/adaptive_lighting/switch.py
View file

@ -42,6 +42,7 @@ from homeassistant.components.light import (
from homeassistant.components.light import DOMAIN as LIGHT_DOMAIN
from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
from homeassistant.components.switch import SwitchEntity
from homeassistant.config_entries import SOURCE_IMPORT
from homeassistant.const import (
ATTR_AREA_ID,
ATTR_DOMAIN,
@ -444,6 +445,22 @@ async def async_setup_entry( # noqa: PLR0915
assert hass is not None
data = hass.data[DOMAIN]
assert config_entry.entry_id in data
_LOGGER.debug(
"Setting up AdaptiveLighting with data: %s and config_entry %s",
data,
config_entry,
)
if ( # Skip deleted YAML config entries
config_entry.source == SOURCE_IMPORT
and config_entry.unique_id not in data.get("__yaml__", [])
):
_LOGGER.warning(
"Deleting AdaptiveLighting switch '%s' because YAML"
" defined switch has been removed from YAML configuration",
config_entry.unique_id,
)
await hass.config_entries.async_remove(config_entry.entry_id)
return
manager = data.setdefault(
ATTR_ADAPTIVE_LIGHTING_MANAGER,
AdaptiveLightingManager(hass, config_entry),