uiprotect 1.6.0__tar.gz → 1.7.1__tar.gz

{uiprotect-1.6.0 → uiprotect-1.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uiprotect
-Version: 1.6.0
+Version: 1.7.1
 Summary: Python API for Unifi Protect (Unofficial)
 Home-page: https://github.com/uilibs/uiprotect
 License: MIT

{uiprotect-1.6.0 → uiprotect-1.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uiprotect"
-version = "1.6.0"
+version = "1.7.1"
 description = "Python API for Unifi Protect (Unofficial)"
 authors = ["UI Protect Maintainers <ui@koston.org>"]
 license = "MIT"

{uiprotect-1.6.0 → uiprotect-1.7.1}/src/uiprotect/data/base.py

@@ -745,6 +745,14 @@ class ProtectModelWithId(ProtectModel):
         revert_on_fail: bool = True,
     ) -> None:
         """Saves the current device changes to UFP."""
+        _LOGGER.debug(
+            "Saving device changes for %s (%s) data_before_changes=%s updated=%s",
+            self.id,
+            self.model,
+            data_before_changes,
+            updated,
+        )
+
         assert (
             self._update_lock.locked()
         ), "save_device_changes should only be called when the update lock is held"

{uiprotect-1.6.0 → uiprotect-1.7.1}/src/uiprotect/data/bootstrap.py

@@ -353,7 +353,7 @@ class Bootstrap(ProtectBaseObject):
             if TYPE_CHECKING:
                 assert isinstance(obj, Event)
             self.process_event(obj)
-        if model_type is ModelType.NVR:
+        elif model_type is ModelType.NVR:
             if TYPE_CHECKING:
                 assert isinstance(obj, NVR)
             self.nvr = obj
@@ -370,7 +370,7 @@ class Bootstrap(ProtectBaseObject):
                 self.id_lookup[obj.id] = ref
                 self.mac_lookup[normalize_mac(obj.mac)] = ref
         else:
-            _LOGGER.debug("Unexpected bootstrap model type for add: %s", obj.model)
+            _LOGGER.debug("Unexpected bootstrap model type for add: %s", model_type)
             return None
 
         updated = obj.dict()

{uiprotect-1.6.0 → uiprotect-1.7.1}/src/uiprotect/data/nvr.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import asyncio
 import logging
 import zoneinfo
+from collections.abc import Callable
 from datetime import datetime, timedelta, tzinfo
 from functools import cache
 from ipaddress import IPv4Address, IPv6Address
@@ -1169,26 +1170,32 @@ class NVR(ProtectDeviceModel):
         if message in self.doorbell_settings.custom_messages:
             raise BadRequest("Custom doorbell message already exists")
 
-        async with self._update_lock:
-            await asyncio.sleep(
-                0,
-            )  # yield to the event loop once we have the look to ensure websocket updates are processed
-            data_before_changes = self.dict_with_excludes()
-            self.doorbell_settings.custom_messages.append(DoorbellText(message))
-            await self.save_device(data_before_changes)
-            self.update_all_messages()
+        await self._update_doorbell_messages(
+            lambda: self.doorbell_settings.custom_messages.append(
+                DoorbellText(message)
+            ),
+        )
 
     async def remove_custom_doorbell_message(self, message: str) -> None:
         """Removes custom doorbell message"""
         if message not in self.doorbell_settings.custom_messages:
             raise BadRequest("Custom doorbell message does not exists")
 
+        await self._update_doorbell_messages(
+            lambda: self.doorbell_settings.custom_messages.remove(
+                DoorbellText(message)
+            ),
+        )
+
+    async def _update_doorbell_messages(
+        self, update_callback: Callable[[], None]
+    ) -> None:
+        """Updates doorbell messages and saves to Protect."""
         async with self._update_lock:
-            await asyncio.sleep(
-                0,
-            )  # yield to the event loop once we have the look to ensure websocket updates are processed
+            # yield to the event loop once we have the lock to ensure websocket updates are processed
+            await asyncio.sleep(0)
             data_before_changes = self.dict_with_excludes()
-            self.doorbell_settings.custom_messages.remove(DoorbellText(message))
+            update_callback()
             await self.save_device(data_before_changes)
             self.update_all_messages()