uiprotect 1.6.0__py3-none-any.whl → 1.7.1__py3-none-any.whl

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/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/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()
 

{uiprotect-1.6.0.dist-info → uiprotect-1.7.1.dist-info}/METADATA

@@ -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.dist-info → uiprotect-1.7.1.dist-info}/RECORD

@@ -14,11 +14,11 @@ uiprotect/cli/nvr.py,sha256=TwxEg2XT8jXAbOqv6gc7KFXELKadeItEDYweSL4_-e8,4260
 uiprotect/cli/sensors.py,sha256=fQtcDJCVxs4VbAqcavgBy2ABiVxAW3GXtna6_XFBp2k,8153
 uiprotect/cli/viewers.py,sha256=2cyrp104ffIvgT0wYGIO0G35QMkEbFe7fSVqLwDXQYQ,2171
 uiprotect/data/__init__.py,sha256=OcfuJl2qXfHcj_mdnrHhzZ5tEIZrw8auziX5IE7dn-I,2938
-uiprotect/data/base.py,sha256=R0FP2kS2MTuu1csBdpMg-_TSIS_YKY-l3q-KZ5gifJs,37492
-uiprotect/data/bootstrap.py,sha256=INRUEbLWnsEJuzlcoFlm7RAT-WPx6odje3aD092QKGo,21465
+uiprotect/data/base.py,sha256=McmQHwbb-gY2y9IjQ85HVBE6Vo0WkBzcXt6JDw5HijE,37708
+uiprotect/data/bootstrap.py,sha256=UxDAo8hz-Rh8XvgfYvUslrWelGFZ5JQ6bnixT4wKJR0,21468
 uiprotect/data/convert.py,sha256=8h6Il_DhMkPRDPj9F_rA2UZIlTuchS3BQD24peKpk2A,2185
 uiprotect/data/devices.py,sha256=Nq3bOko5PFf5LvEBoD4JV8kmbq50laRdh3VHMWX7t-0,111809
-uiprotect/data/nvr.py,sha256=jwJEl4o2kbvoYFB9wSJPghNj0905847-86ElT51nNs0,47580
+uiprotect/data/nvr.py,sha256=XC4NO1c_Mom-hIpzj9ksKFcgKbHd6ToqWjkgzxJ1PJY,47636
 uiprotect/data/types.py,sha256=-hhrnPZheC81eKIJOIZIGCb-A7jOBqa0zLWsmh9_vFQ,17220
 uiprotect/data/user.py,sha256=Wb-ZWSwIJbyUbfVuENtUYbuW-uftHNDcoMH85dvEjkw,7071
 uiprotect/data/websocket.py,sha256=WZJVA7EfYuKYMv-9jmvGgMWXKzE9ES25SKv1NQ2eHjc,6281
@@ -30,8 +30,8 @@ uiprotect/test_util/__init__.py,sha256=d2g7afa0LSdixQ0kjEDYwafDFME_UlW2LzxpamZ2B
 uiprotect/test_util/anonymize.py,sha256=f-8ijU-_y9r-uAbhIPn0f0I6hzJpAkvJzc8UpWihObI,8478
 uiprotect/utils.py,sha256=6OLY8hNiCzk418PjJJIlFW7jjPzVt1vxBKEzBSqMeTk,18418
 uiprotect/websocket.py,sha256=IzDPyqbzrkOMREvahN-e2zdvVD0VABSCWy6jSoCwOT0,7299
-uiprotect-1.6.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-1.6.0.dist-info/METADATA,sha256=kn6AzzXA29UsBKuPbQQ7cPejq16XkWfbJmTLccARaog,10984
-uiprotect-1.6.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiprotect-1.6.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-1.6.0.dist-info/RECORD,,
+uiprotect-1.7.1.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-1.7.1.dist-info/METADATA,sha256=eHSgWjOd86ZiGte16Nes5SRHRILMRdos-M0xWXNZpYI,10984
+uiprotect-1.7.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiprotect-1.7.1.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-1.7.1.dist-info/RECORD,,