Merge pull request #128 from BaQs/ezviz_cleanup_encryption_key

Cleanup return for camera encryption key, add advanced detect to camera.
BaQs · Jul 8, 2023 · 6847216 · 6847216
2 parents 56af67e + d24e93e
commit 6847216
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/pyezviz/camera.py b/pyezviz/camera.py
@@ -160,6 +160,9 @@ def status(self) -> dict[Any, Any]:
             "batteryCameraWorkMode": self.fetch_key(
                 ["STATUS", "optionals", "workMode"]
             ),
+            "Alarm_AdvancedDetect": self.fetch_key(
+                ["STATUS", "optionals", "Alarm_AdvancedDetect", "type"]
+            ),
             "wifiInfos": self._device["WIFI"],
             "switches": self._switch,
             "optionals": self.fetch_key(["STATUS", "optionals"]),

diff --git a/pyezviz/client.py b/pyezviz/client.py
@@ -1178,7 +1178,7 @@ def ptz_control(
     def get_cam_key(
         self, serial: str, smscode: int | None = None, max_retries: int = 0
     ) -> Any:
-        """Get Camera encryption key."""
+        """Get Camera encryption key. The key that is set after the camera is added to the account."""
 
         if max_retries > MAX_RETRIES:
             raise PyEzvizError("Can't gather proper data. Max retries exceeded.")
@@ -1234,7 +1234,7 @@ def get_cam_key(
                 f"Could not get camera encryption key: Got {json_output})"
             )
 
-        return json_output
+        return json_output["encryptkey"]
 
     def create_panoramic(self, serial: str, max_retries: int = 0) -> Any:
         """Create panoramic image."""

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name='pyezviz',
-    version="0.2.2.0",
+    version="0.2.2.1",
     license='Apache Software License 2.0',
     author='Pierre Ourdouille',
     author_email='baqs@users.github.com',