Compare commits

...

2 Commits

Author SHA1 Message Date
topsworld
2446d69c74 feat: update notify after rm device 2025-01-13 15:48:32 +08:00
topsworld
ca2edbd917 feat: simplify the unsub logic 2025-01-13 15:37:45 +08:00

View File

@ -851,25 +851,26 @@ class MIoTClient:
async def remove_device_async(self, did: str) -> None:
if did not in self._device_list_cache:
return
self._mips_cloud.unsub_prop(did=did)
self._mips_cloud.unsub_event(did=did)
if self._ctrl_mode == CtrlMode.AUTO:
if did in self._device_list_gateway:
mips = self._mips_local.get(
self._device_list_gateway[did]['group_id'], None)
if mips:
mips.unsub_prop(did=did)
mips.unsub_event(did=did)
elif self._miot_lan.init_done and did in self._device_list_lan:
sub_from = self._sub_source_list.pop(did, None)
# Unsub
if sub_from:
if sub_from == 'cloud':
self._mips_cloud.unsub_prop(did=did)
self._mips_cloud.unsub_event(did=did)
elif sub_from == 'lan':
self._miot_lan.unsub_prop(did=did)
self._miot_lan.unsub_event(did=did)
self._sub_source_list.pop(did, None)
self._device_list_cache.pop(did, None)
elif sub_from in self._mips_local:
mips = self._mips_local[sub_from]
mips.unsub_prop(did=did)
mips.unsub_event(did=did)
# Storage
await self._storage.save_async(
domain='miot_devices',
name=f'{self._uid}_{self._cloud_server}',
data=self._device_list_cache)
# Update notify
self.__request_show_devices_changed_notify()
def __get_exec_error_with_rc(self, rc: int) -> str:
err_msg: str = self._i18n.translate(key=f'error.common.{rc}')