Merge pull request #297 from fronzbot/dependabot/pip/pre-commit-2.5.1

Bump pre-commit from 2.5.0 to 2.5.1

blinkpy/api.py

@@ -107,7 +107,7 @@ def request_system_arm(blink, network):
     :param blink: Blink instance.
     :param network: Sync module network id.
     """
-    url = f"{blink.urls.base_url}/network/{network}/arm"
+    url = f"{blink.urls.base_url}/api/v1/accounts/{blink.account_id}/networks/{network}/state/arm"
     return http_post(blink, url)
 
 
@@ -119,7 +119,7 @@ def request_system_disarm(blink, network):
     :param blink: Blink instance.
     :param network: Sync module network id.
     """
-    url = f"{blink.urls.base_url}/network/{network}/disarm"
+    url = f"{blink.urls.base_url}/api/v1/accounts/{blink.account_id}/networks/{network}/state/disarm"
     return http_post(blink, url)
 
 

blinkpy/camera.py

@@ -61,7 +61,10 @@ class BlinkCamera:
     @property
     def temperature_c(self):
         """Return temperature in celcius."""
-        return round((self.temperature - 32) / 9.0 * 5.0, 1)
+        try:
+            return round((self.temperature - 32) / 9.0 * 5.0, 1)
+        except TypeError:
+            return None
 
     @property
     def image_from_cache(self):

blinkpy/helpers/constants.py

@@ -4,7 +4,7 @@ import os
 
 MAJOR_VERSION = 0
 MINOR_VERSION = 16
-PATCH_VERSION = "0-rc3"
+PATCH_VERSION = "0-rc4"
 
 __version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}.{PATCH_VERSION}"
 

blinkpy/sync_module.py

@@ -77,8 +77,10 @@ class BlinkSyncModule:
 
     @arm.setter
     def arm(self, value):
-        """Arm or disarm system."""
-        _LOGGER.warning("Arm/Disarm API for %s not currently implemented.", self.name)
+        """Arm or disarm camera."""
+        if value:
+            return api.request_system_arm(self.blink, self.network_id)
+        return api.request_system_disarm(self.blink, self.network_id)
 
     def start(self):
         """Initialize the system."""
@@ -272,23 +274,3 @@ class BlinkOwl(BlinkSyncModule):
     @network_info.setter
     def network_info(self, value):
         """Set network_info property."""
-
-    @property
-    def arm(self):
-        """Return arm status."""
-        try:
-            return self.network_info["network"]["armed"]
-        except (KeyError, TypeError):
-            self.available = False
-            return None
-
-    @arm.setter
-    def arm(self, value):
-        """Arm or disarm camera."""
-        if value:
-            return api.request_motion_detection_enable(
-                self.blink, self.network_id, self.sync_id
-            )
-        return api.request_motion_detection_disable(
-            self.blink, self.network_id, self.sync_id
-        )

requirements_test.txt

@@ -2,7 +2,7 @@ black==19.10b0
 coverage==5.1
 flake8==3.8.3
 flake8-docstrings==1.5.0
-pre-commit==2.5.0
+pre-commit==2.5.1
 pylint==2.5.3
 pydocstyle==5.0.2
 pytest==5.4.3

tests/test_cameras.py

@@ -11,7 +11,7 @@ from unittest import mock
 from blinkpy.blinkpy import Blink
 from blinkpy.helpers.util import BlinkURLHandler
 from blinkpy.sync_module import BlinkSyncModule
-from blinkpy.camera import BlinkCamera
+from blinkpy.camera import BlinkCamera, BlinkCameraMini
 
 
 CAMERA_CFG = {
@@ -161,3 +161,21 @@ class TestBlinkCameraSetup(unittest.TestCase):
         mock_en.return_value = "enable"
         self.assertEqual(self.camera.set_motion_detect(True), "enable")
         self.assertEqual(self.camera.set_motion_detect(False), "disable")
+
+    def test_missing_attributes(self, mock_resp):
+        """Test that attributes return None if missing."""
+        self.camera.temperature = None
+        self.camera.serial = None
+        attr = self.camera.attributes
+        self.assertEqual(attr["serial"], None)
+        self.assertEqual(attr["temperature"], None)
+        self.assertEqual(attr["temperature_c"], None)
+
+    def test_mini_missing_attributes(self, mock_resp):
+        """Test that attributes return None if missing."""
+        camera = BlinkCameraMini(self.blink.sync)
+        self.blink.sync.network_id = None
+        self.blink.sync.name = None
+        attr = camera.attributes
+        for key in attr:
+            self.assertEqual(attr[key], None)