uiprotect 5.2.2__py3-none-any.whl → 5.3.0__py3-none-any.whl

uiprotect/api.py

@@ -1401,21 +1401,20 @@ class ProtectApiClient(BaseApiClient):
 
         Datetime of screenshot is approximate. It may be +/- a few seconds.
         """
-        params = {
-            "ts": to_js_time(dt or utc_now()),
-            "force": "true",
-        }
+        params: dict[str, Any] = {}
+        if dt is not None:
+            path = "recording-snapshot"
+            params["ts"] = to_js_time(dt)
+        else:
+            path = "snapshot"
+            params["ts"] = int(time.time() * 1000)
+            params["force"] = "true"
 
         if width is not None:
-            params.update({"w": width})
+            params["w"] = width
 
         if height is not None:
-            params.update({"h": height})
-
-        path = "snapshot"
-        if dt is not None:
-            path = "recording-snapshot"
-            del params["force"]
+            params["h"] = height
 
         return await self.api_request_raw(
             f"cameras/{camera_id}/{path}",
@@ -1435,22 +1434,21 @@ class ProtectApiClient(BaseApiClient):
 
         Datetime of screenshot is approximate. It may be +/- a few seconds.
         """
-        params = {
-            "ts": to_js_time(dt or utc_now()),
-            "force": "true",
-        }
+        params: dict[str, Any] = {}
+        if dt is not None:
+            path = "recording-snapshot"
+            params["ts"] = to_js_time(dt)
+            params["lens"] = 2
+        else:
+            path = "package-snapshot"
+            params["ts"] = int(time.time() * 1000)
+            params["force"] = "true"
 
         if width is not None:
-            params.update({"w": width})
+            params["w"] = width
 
         if height is not None:
-            params.update({"h": height})
-
-        path = "package-snapshot"
-        if dt is not None:
-            path = "recording-snapshot"
-            del params["force"]
-            params.update({"lens": 2})
+            params["h"] = height
 
         return await self.api_request_raw(
             f"cameras/{camera_id}/{path}",

uiprotect/data/types.py

@@ -111,6 +111,16 @@ class ModelType(str, UnknownValuesEnumMixin, enum.Enum):
         """Return the devices key."""
         return f"{self.value}s"
 
+    @cached_property
+    def name(self) -> str:
+        """Return the name."""
+        return self._name_
+
+    @cached_property
+    def value(self) -> str:
+        """Return the value."""
+        return self._value_
+
     @classmethod
     @cache
     def from_string(cls, value: str) -> ModelType:
@@ -575,6 +585,16 @@ class PermissionNode(str, UnknownValuesEnumMixin, enum.Enum):
     READ_LIVE = "readlive"
     UNKNOWN = "unknown"
 
+    @cached_property
+    def name(self) -> str:
+        """Return the name."""
+        return self._name_
+
+    @cached_property
+    def value(self) -> str:
+        """Return the value."""
+        return self._value_
+
 
 @enum.unique
 class HDRMode(str, UnknownValuesEnumMixin, enum.Enum):

uiprotect/data/user.py

@@ -210,7 +210,7 @@ class User(ProtectModelWithId):
     ) -> bool:
         """Checks if a user can do a specific action"""
         check_self = False
-        if model == self.model and obj is not None and obj.id == self.id:
+        if model is self.model and obj is not None and obj.id == self.id:
             perm_str = f"{model.value}:{node.value}:$"
             check_self = True
         else:
@@ -221,7 +221,7 @@ class User(ProtectModelWithId):
             return self._perm_cache[perm_str]
 
         for perm in self.all_permissions:
-            if model != perm.model or node not in perm.nodes:
+            if model is not perm.model or node not in perm.nodes:
                 continue
             if perm.obj_ids is None:
                 self._perm_cache[perm_str] = True

{uiprotect-5.2.2.dist-info → uiprotect-5.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uiprotect
-Version: 5.2.2
+Version: 5.3.0
 Summary: Python API for Unifi Protect (Unofficial)
 Home-page: https://github.com/uilibs/uiprotect
 Author: UI Protect Maintainers

{uiprotect-5.2.2.dist-info → uiprotect-5.3.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 uiprotect/__init__.py,sha256=GDRM9WvWUBbOyBVgltq6Qv8i7LVdWEbG8q5EzYvOFbE,636
 uiprotect/__main__.py,sha256=C_bHCOkv5qj6WMy-6ELoY3Y6HDhLxOa1a30CzmbZhsg,462
-uiprotect/api.py,sha256=8zfSeqDKArG2pbvImqibQx4HrMi_y06fYXrgcwYztCc,67585
+uiprotect/api.py,sha256=1gtyhk-MRFy6_wGR32Y520XJ2Ucxr1nevuBosod0r7w,67637
 uiprotect/cli/__init__.py,sha256=1MO8rJmjjAsfVx2x01gn5DJo8B64xdPGo6gRVJbWd18,8868
 uiprotect/cli/backup.py,sha256=ZiS7RZnJGKI8TJKLW2cOUzkRM8nyTvE5Ov_jZZGtvSM,36708
 uiprotect/cli/base.py,sha256=k-_qGuNT7br0iV0KE5F4wYXF75iyLLjBEckTqxC71xM,7591
@@ -19,8 +19,8 @@ uiprotect/data/bootstrap.py,sha256=OSPHu08p7Ys9KqEb8sq_LFufuECtF4lY7OnAYK27ngo,2
 uiprotect/data/convert.py,sha256=8h6Il_DhMkPRDPj9F_rA2UZIlTuchS3BQD24peKpk2A,2185
 uiprotect/data/devices.py,sha256=0l8eiTCwacdHCmOc7qNzeUMpHLxvd6FeB7DOqZKycdA,110880
 uiprotect/data/nvr.py,sha256=8M-62AG4q1k71eX-DaFcdO52QWG4zO9X5Voj0Tj9D5A,46598
-uiprotect/data/types.py,sha256=3CocULpkdTgF4is1nIEDYIlwf2EOkNNM7L4kJ7NkAwM,17654
-uiprotect/data/user.py,sha256=YvgXJKV4_y-bm0eySWz9f_ie9aR5lpVn17t9H0Pix8I,6998
+uiprotect/data/types.py,sha256=nrTvvpI3Ja5IV-ixmOpsYwTXrggRK_vQth9InQn-FkI,18088
+uiprotect/data/user.py,sha256=1o5gyPHafn4lHARpoSMD_NWbo5IbzGPfiSASwqqDvWs,7002
 uiprotect/data/websocket.py,sha256=5-yM6yr8NrxKJjBPQlGVXXQUTcksF-UavligKYjJQ3k,6770
 uiprotect/exceptions.py,sha256=kgn0cRM6lTtgLza09SDa3ZiX6ue1QqHCOogQ4qu6KTQ,965
 uiprotect/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -30,8 +30,8 @@ uiprotect/test_util/__init__.py,sha256=Ky8mTL61nhp5II2mxTKBAsSGvNqK8U_CfKC5AGwTo
 uiprotect/test_util/anonymize.py,sha256=f-8ijU-_y9r-uAbhIPn0f0I6hzJpAkvJzc8UpWihObI,8478
 uiprotect/utils.py,sha256=O2RIiUZX4kBHq5v3L598uYe7rbhOcKTeqyYQi6rITnQ,19865
 uiprotect/websocket.py,sha256=D5DZrMzo434ecp8toNxOB5HM193kVwYw42yEcg99yMw,8029
-uiprotect-5.2.2.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
-uiprotect-5.2.2.dist-info/METADATA,sha256=QQDSk2kJVhI26UrCHznBCNmQHzfVXuxL4yuGAOK1fAI,11009
-uiprotect-5.2.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uiprotect-5.2.2.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
-uiprotect-5.2.2.dist-info/RECORD,,
+uiprotect-5.3.0.dist-info/LICENSE,sha256=INx18jhdbVXMEiiBANeKEbrbz57ckgzxk5uutmmcxGk,1111
+uiprotect-5.3.0.dist-info/METADATA,sha256=t-z36ZssCujkhRP7d_YGpeqiEufq2tIBEii5ThRopZ8,11009
+uiprotect-5.3.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uiprotect-5.3.0.dist-info/entry_points.txt,sha256=J78AUTPrTTxgI3s7SVgrmGqDP7piX2wuuEORzhDdVRA,47
+uiprotect-5.3.0.dist-info/RECORD,,