0.19.1

CHANGES.rst

@@ -4,6 +4,23 @@ Changelog
 
 A list of changes between each release
 
+0.19.1 (2022-06-26)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+**Bugfixes**
+
+- Fix getting doorbell details (`@uvjim <https://github.com/fronzbot/blinkpy/pull/584>`__)
+- Potential fix for mixed camera usage (`#590 <https://github.com/fronzbot/blinkpy/pull/590>`__)
+
+**Other Changes**
+
+- doc update (`@dwaltsch <https://github.com/fronzbot/blinkpy/pull/579>`__)
+- Test re-factoring (`#591 <https://github.com/fronzbot/blinkpy/pull/591>`__)
+- Bump pylint to 2.14.3
+- Bump coverage to 6.41
+- Bump black to 22.3.0
+
+
 0.19.0 (2022-03-20)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

CONTRIBUTING.rst

@@ -14,14 +14,15 @@ Start Developing
 -----------------
 
 1. Setup Local Repository
+
    .. code:: bash
 
        $ git clone https://github.com/<YOUR_GIT_USERNAME>/blinkpy.git
        $ cd blinkpy
        $ git remote add upstream https://github.com/fronzbot/blinkpy.git
 
 2. Create virtualenv and install dependencies
-   
+
    .. code:: bash
 
        $ python -m venv venv

blinkpy/blinkpy.py

@@ -221,7 +221,7 @@ def setup_camera_list(self):
                     all_cameras[camera_network] = []
                 for camera in network["cameras"]:
                     all_cameras[camera_network].append(
-                        {"name": camera["name"], "id": camera["id"]}
+                        {"name": camera["name"], "id": camera["id"], "type": "default"}
                     )
             mini_cameras = self.setup_owls()
             lotus_cameras = self.setup_lotus()

blinkpy/camera.py

@@ -150,7 +150,9 @@ def extract_config_info(self, config):
         self.serial = config.get("serial", None)
         self.motion_enabled = config.get("enabled", "unknown")
         self.battery_voltage = config.get("battery_voltage", None)
-        self.battery_state = config.get("battery_state", None)
+        self.battery_state = config.get("battery_state", None) or config.get(
+            "battery", None
+        )
         self.temperature = config.get("temperature", None)
         self.wifi_strength = config.get("wifi_strength", None)
         self.product_type = config.get("type", None)

blinkpy/helpers/constants.py

@@ -4,7 +4,7 @@
 
 MAJOR_VERSION = 0
 MINOR_VERSION = 19
-PATCH_VERSION = 0
+PATCH_VERSION = 1
 
 __version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}.{PATCH_VERSION}"
 

blinkpy/sync_module.py

@@ -39,7 +39,7 @@ def __init__(self, blink, network_name, network_id, camera_list):
         self.available = False
         self.type_key_map = {
             "mini": "owls",
-            "lotus": "doorbell",
+            "lotus": "doorbells",
         }
 
     @property
@@ -125,6 +125,7 @@ def update_cameras(self, camera_type=BlinkCamera):
         type_map = {
             "mini": BlinkCameraMini,
             "lotus": BlinkDoorbell,
+            "default": BlinkCamera,
         }
         try:
             for camera_config in self.camera_list:

requirements_test.txt

@@ -1,9 +1,9 @@
-black==22.1.0
-coverage==6.3.2
+black==22.3.0
+coverage==6.4.1
 flake8==3.9.1
 flake8-docstrings==1.6.0
 pre-commit==2.17.0
-pylint==2.10.2
+pylint==2.14.3
 pydocstyle==6.0.0
 pytest==7.1.1
 pytest-cov==3.0.0

tests/test_blinkpy.py

@@ -103,8 +103,11 @@ def test_setup_cameras(self, mock_home, mock_req):
         self.assertEqual(
             result,
             {
-                "1234": [{"name": "foo", "id": 5678}, {"name": "bar", "id": 5679}],
-                "4321": [{"name": "test", "id": 0000}],
+                "1234": [
+                    {"name": "foo", "id": 5678, "type": "default"},
+                    {"name": "bar", "id": 5679, "type": "default"},
+                ],
+                "4321": [{"name": "test", "id": 0000, "type": "default"}],
             },
         )
 
@@ -327,35 +330,6 @@ def test_initialize_blink_doorbells(self, mock_start):
         self.assertEqual(self.blink.sync["foo"].name, "foo")
         self.assertEqual(self.blink.sync["bar"].name, "bar")
 
-    # def test_blink_doorbell_cameras_returned(self):
-    #     """Test that blink doorbell cameras are found if attached to sync module."""
-    #     self.blink.network_ids = ["1234"]
-    #     self.blink.homescreen = {
-    #         "doorbells": [
-    #             {
-    #                 "id": 1,
-    #                 "name": "foo",
-    #                 "network_id": 1234,
-    #                 "onboarded": True,
-    #                 "enabled": True,
-    #                 "status": "online",
-    #                 "thumbnail": "/foo/bar",
-    #                 "serial": "abc123",
-    #             }
-    #         ]
-    #     }
-    #     result = self.blink.setup_lotus()
-    #     self.assertEqual(self.blink.network_ids, ["1234"])
-    #     self.assertEqual(
-    #         result, [{"1234": {"name": "foo", "id": "1234", "type": "doorbell"}}]
-    #     )
-
-    #     self.blink.network_ids = []
-    #     self.blink.get_homescreen()
-    #     result = self.blink.setup_lotus()
-    #     self.assertEqual(self.blink.network_ids, [])
-    #     self.assertEqual(result, [])
-
     @mock.patch("blinkpy.api.request_camera_usage")
     def test_blink_doorbell_attached_to_sync(self, mock_usage):
         """Test that blink doorbell cameras are properly attached to sync module."""
@@ -380,6 +354,151 @@ def test_blink_doorbell_attached_to_sync(self, mock_usage):
             result, {"1234": [{"name": "foo", "id": "1234", "type": "doorbell"}]}
         )
 
+    @mock.patch("blinkpy.api.request_camera_usage")
+    def test_blink_multi_doorbell(self, mock_usage):
+        """Test that multiple doorbells are properly attached to sync module."""
+        self.blink.network_ids = ["1234"]
+        self.blink.homescreen = {
+            "doorbells": [
+                {
+                    "id": 1,
+                    "name": "foo",
+                    "network_id": 1234,
+                    "onboarded": True,
+                    "enabled": True,
+                    "status": "online",
+                    "thumbnail": "/foo/bar",
+                    "serial": "abc123",
+                },
+                {
+                    "id": 2,
+                    "name": "bar",
+                    "network_id": 1234,
+                    "onboarded": True,
+                    "enabled": True,
+                    "status": "online",
+                    "thumbnail": "/bar/foo",
+                    "serial": "zxc456",
+                },
+            ]
+        }
+        expected = {
+            "1234": [
+                {"name": "foo", "id": "1234", "type": "doorbell"},
+                {"name": "bar", "id": "1234", "type": "doorbell"},
+            ]
+        }
+        mock_usage.return_value = {"networks": [{"cameras": [], "network_id": 1234}]}
+        result = self.blink.setup_camera_list()
+        self.assertEqual(result, expected)
+
+    @mock.patch("blinkpy.api.request_camera_usage")
+    def test_blink_multi_mini(self, mock_usage):
+        """Test that multiple minis are properly attached to sync module."""
+        self.blink.network_ids = ["1234"]
+        self.blink.homescreen = {
+            "owls": [
+                {
+                    "id": 1,
+                    "name": "foo",
+                    "network_id": 1234,
+                    "onboarded": True,
+                    "enabled": True,
+                    "status": "online",
+                    "thumbnail": "/foo/bar",
+                    "serial": "abc123",
+                },
+                {
+                    "id": 2,
+                    "name": "bar",
+                    "network_id": 1234,
+                    "onboarded": True,
+                    "enabled": True,
+                    "status": "online",
+                    "thumbnail": "/bar/foo",
+                    "serial": "zxc456",
+                },
+            ]
+        }
+        expected = {
+            "1234": [
+                {"name": "foo", "id": "1234", "type": "mini"},
+                {"name": "bar", "id": "1234", "type": "mini"},
+            ]
+        }
+        mock_usage.return_value = {"networks": [{"cameras": [], "network_id": 1234}]}
+        result = self.blink.setup_camera_list()
+        self.assertEqual(result, expected)
+
+    @mock.patch("blinkpy.api.request_camera_usage")
+    def test_blink_camera_mix(self, mock_usage):
+        """Test that a mix of cameras are properly attached to sync module."""
+        self.blink.network_ids = ["1234"]
+        self.blink.homescreen = {
+            "doorbells": [
+                {
+                    "id": 1,
+                    "name": "foo",
+                    "network_id": 1234,
+                    "onboarded": True,
+                    "enabled": True,
+                    "status": "online",
+                    "thumbnail": "/foo/bar",
+                    "serial": "abc123",
+                },
+                {
+                    "id": 2,
+                    "name": "bar",
+                    "network_id": 1234,
+                    "onboarded": True,
+                    "enabled": True,
+                    "status": "online",
+                    "thumbnail": "/bar/foo",
+                    "serial": "zxc456",
+                },
+            ],
+            "owls": [
+                {
+                    "id": 3,
+                    "name": "dead",
+                    "network_id": 1234,
+                    "onboarded": True,
+                    "enabled": True,
+                    "status": "online",
+                    "thumbnail": "/dead/beef",
+                    "serial": "qwerty",
+                },
+                {
+                    "id": 4,
+                    "name": "beef",
+                    "network_id": 1234,
+                    "onboarded": True,
+                    "enabled": True,
+                    "status": "online",
+                    "thumbnail": "/beef/dead",
+                    "serial": "dvorak",
+                },
+            ],
+        }
+        expected = {
+            "1234": [
+                {"name": "foo", "id": "1234", "type": "doorbell"},
+                {"name": "bar", "id": "1234", "type": "doorbell"},
+                {"name": "dead", "id": "1234", "type": "mini"},
+                {"name": "beef", "id": "1234", "type": "mini"},
+                {"name": "normal", "id": "1234", "type": "default"},
+            ]
+        }
+        mock_usage.return_value = {
+            "networks": [
+                {"cameras": [{"name": "normal", "id": "1234"}], "network_id": 1234}
+            ]
+        }
+        result = self.blink.setup_camera_list()
+        self.assertTrue("1234" in result)
+        for element in result["1234"]:
+            self.assertTrue(element in expected["1234"])
+
 
 class MockSync:
     """Mock sync module class."""