Skip to content

Improve, cleanup latest coordinator-change #724

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
bouwew merged 1 commit into from
Sep 22, 2024
Merged

Improve, cleanup latest coordinator-change #724

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
11 changes: 4 additions & 7 deletions custom_components/plugwise/coordinator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,21 +135,18 @@ def _async_remove_devices(self, data: PlugwiseData, entry: ConfigEntry) -> None:
device_list = dr.async_entries_for_config_entry(
device_reg, self.config_entry.entry_id
)
# via_device cannot be None, this will result in the deletion
# of other Plugwise Gateways when present!
via_device: str = ""

# First find the Plugwise via_device
via_device_device = device_reg.async_get_device(identifiers={(DOMAIN, data.gateway[GATEWAY_ID])})
if via_device_device is not None:
via_device = via_device_device.id
gateway_device = device_reg.async_get_device({(DOMAIN, data.gateway[GATEWAY_ID])})
if gateway_device is not None:
via_device_id = gateway_device.id

# Then remove the connected orphaned device(s)
for device_entry in device_list:
for identifier in device_entry.identifiers:
if identifier[0] == DOMAIN:
if (
device_entry.via_device_id == via_device
device_entry.via_device_id == via_device_id
and identifier[1] not in data.devices
):
device_reg.async_update_device(
Expand Down