Skip to content

Streamline setup of deCONZ lock from light platform #71659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frenck merged 1 commit into from
May 11, 2022
Merged

Streamline setup of deCONZ lock from light platform #71659

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 8 additions & 20 deletions homeassistant/components/deconz/lock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

from typing import Any

from pydeconz.models.event import EventType
from pydeconz.models.light.lock import Lock
from pydeconz.models.sensor.door_lock import DoorLock

Expand All @@ -27,31 +28,19 @@ async def async_setup_entry(
gateway.entities[DOMAIN] = set()

@callback
def async_add_lock_from_light(lights: list[Lock] | None = None) -> None:
def async_add_lock_from_light(_: EventType, lock_id: str) -> None:
"""Add lock from deCONZ."""
entities = []

if lights is None:
lights = list(gateway.api.lights.locks.values())

for light in lights:

if (
isinstance(light, Lock)
and light.unique_id not in gateway.entities[DOMAIN]
):
entities.append(DeconzLock(light, gateway))

if entities:
async_add_entities(entities)
lock = gateway.api.lights.locks[lock_id]
async_add_entities([DeconzLock(lock, gateway)])

config_entry.async_on_unload(
async_dispatcher_connect(
hass,
gateway.signal_new_light,
gateway.api.lights.locks.subscribe(
async_add_lock_from_light,
EventType.ADDED,
)
)
for lock_id in gateway.api.lights.locks:
async_add_lock_from_light(EventType.ADDED, lock_id)

@callback
def async_add_lock_from_sensor(sensors: list[DoorLock] | None = None) -> None:
Expand Down Expand Up @@ -80,7 +69,6 @@ def async_add_lock_from_sensor(sensors: list[DoorLock] | None = None) -> None:
)
)

async_add_lock_from_light()
async_add_lock_from_sensor()


Expand Down