Merge pull request #606 from fronzbot/dev

v0.19.2

CHANGES.rst

@@ -4,18 +4,32 @@ Changelog
 
 A list of changes between each release
 
+0.19.2 (2022-07-26)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+**Bugfixes**
+
+- Fix doorbell mapping (`@uvjim #599 <https://github.com/fronzbot/blinkpy/pull/599>`__)
+- Fix the errors for the Blink doorbell camera (`@ruby-dev #603 <https://github.com/fronzbot/blinkpy/pull/603>`__)
+
+**Other Changes**
+
+- dev version bump (`@fronzbot #593 <https://github.com/fronzbot/blinkpy/pull/593>`__)
+- Fix typo in README regarding disarm syntax (`@dashrb #597 <https://github.com/fronzbot/blinkpy/pull/597>`__)
+
+
 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>`__)
+- Fix getting doorbell details (`@uvjim #584 <https://github.com/fronzbot/blinkpy/pull/584>`__)
+- Potential fix for mixed camera usage (`@fronzbot #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>`__)
+- doc update (`@dwaltsch #579 <https://github.com/fronzbot/blinkpy/pull/579>`__)
+- Test re-factoring (`@fronzbot #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
@@ -26,19 +40,19 @@ A list of changes between each release
 
 **Bugfixes:**
 
-- Debug log in prase download method fix (`@tieum <https://github.com/fronzbot/blinkpy/pull/540>`__)
-- Fix issue with malformed thumbnails (`#550 <https://github.com/fronzbot/blinkpy/pull/550>`__)
-- Fully support new thumbnail API (`@gdoermann <https://github.com/fronzbot/blinkpy/pull/552>`__)
+- Debug log in prase download method fix (`@tieum #540 <https://github.com/fronzbot/blinkpy/pull/540>`__)
+- Fix issue with malformed thumbnails (`@fronzbot #550 <https://github.com/fronzbot/blinkpy/pull/550>`__)
+- Fully support new thumbnail API (`@gdoermann #552 <https://github.com/fronzbot/blinkpy/pull/552>`__)
 
 **New Features:**
 
-- Support for arm/disarm of Blink Mini cameras (`@mstratford <https://github.com/fronzbot/blinkpy/pull/546>`__)
-- Add product_type to BlinkCamera class to report type of camera (`#553 <https://github.com/fronzbot/blinkpy/pull/553>`__)
-- Remove python 3.6 support, add python 3.10 support (`#554 <https://github.com/fronzbot/blinkpy/pull/554>`__)
+- Support for arm/disarm of Blink Mini cameras (`@mstratford #546 <https://github.com/fronzbot/blinkpy/pull/546>`__)
+- Add product_type to BlinkCamera class to report type of camera (`@fronzbot #553 <https://github.com/fronzbot/blinkpy/pull/553>`__)
+- Remove python 3.6 support, add python 3.10 support (`@fronzbot #554 <https://github.com/fronzbot/blinkpy/pull/554>`__)
 
 **Other:**
 
-- Make code that determines need for unique class (Mini + Doorbells) generic (`#553 <https://github.com/fronzbot/blinkpy/pull/553>`__)
+- Make code that determines need for unique class (Mini + Doorbells) generic (`@fronzbot #553 <https://github.com/fronzbot/blinkpy/pull/553>`__)
 - Bump pre-commit to 2.17.0
 - Bump pytest-timeout to 2.1.0
 - Bump pygments to 2.11.2
@@ -57,7 +71,7 @@ A list of changes between each release
 
 **New Features:**
 
-- Support for Blink Doorbell (`@magicalyak <https://github.com/fronzbot/blinkpy/pull/526>`__)
+- Support for Blink Doorbell (`@magicalyak #526 <https://github.com/fronzbot/blinkpy/pull/526>`__)
 
 **Other:**
 
@@ -74,7 +88,7 @@ A list of changes between each release
 0.17.1 (2021-02-18)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- Add delay parameter to Blink.download_videos method in order to throttle API during video retrieval (`#437 <https://github.com/fronzbot/blinkpy/pull/437>`__)
+- Add delay parameter to Blink.download_videos method in order to throttle API during video retrieval (`@fronzbot #437 <https://github.com/fronzbot/blinkpy/pull/437>`__)
 - Bump pylint to 2.6.2
 
 
@@ -83,13 +97,13 @@ A list of changes between each release
 
 **Bugfixes:**
 
-- Fix video downloading bug (`#424 <https://github.com/fronzbot/blinkpy/pull/424>`__)
-- Fix repeated authorization email bug (`#432 <https://github.com/fronzbot/blinkpy/pull/432>`__ and `#428 <https://github.com/fronzbot/blinkpy/pull/428>`__)
+- Fix video downloading bug (`@fronzbot #424 <https://github.com/fronzbot/blinkpy/pull/424>`__)
+- Fix repeated authorization email bug (`@fronzbot #432 <https://github.com/fronzbot/blinkpy/pull/432>`__ and `@fronzbot #428 <https://github.com/fronzbot/blinkpy/pull/428>`__)
 
 **New Features:**
 
-- Add logout method (`#429 <https://github.com/fronzbot/blinkpy/pull/429>`__)
-- Add camera record method (`#430 <https://github.com/fronzbot/blinkpy/pull/430>`__)
+- Add logout method (`@fronzbot #429 <https://github.com/fronzbot/blinkpy/pull/429>`__)
+- Add camera record method (`@fronzbot #430 <https://github.com/fronzbot/blinkpy/pull/430>`__)
 
 **Other:**
 
@@ -109,18 +123,18 @@ A list of changes between each release
 
 **Bugfixes:**
 
-- Updated liveview endpoint (`#389 <https://github.com/fronzbot/blinkpy/pull/389>`__)
-- Fixed mini thumbnail not updating (`#388 <https://github.com/fronzbot/blinkpy/pull/388>`__)
-- Add exception catch to prevent NoneType error on refresh, added test to check behavior as well (`#401 <https://github.com/fronzbot/blinkpy/pull/401>`__)
+- Updated liveview endpoint (`@fronzbot #389 <https://github.com/fronzbot/blinkpy/pull/389>`__)
+- Fixed mini thumbnail not updating (`@fronzbot #388 <https://github.com/fronzbot/blinkpy/pull/388>`__)
+- Add exception catch to prevent NoneType error on refresh, added test to check behavior as well (`@fronzbot #401 <https://github.com/fronzbot/blinkpy/pull/401>`__)
   - Unrelated: had to add two force methods to refresh for testing purposes. Should not change normal usage.
-- Fix malformed stream url (`#395 <https://github.com/fronzbot/blinkpy/pull/395>`__)
+- Fix malformed stream url (`@fronzbot #395 <https://github.com/fronzbot/blinkpy/pull/395>`__)
 
 **All:**
 
-- Moved testtools to requirements_test.txt (`#387 <https://github.com/fronzbot/blinkpy/pull/387>`__)
+- Moved testtools to requirements_test.txt (`@fronzbot #387 <https://github.com/fronzbot/blinkpy/pull/387>`__)
 - Bumped pytest to 6.1.1
 - Bumped flake8 to 3.8.4
-- Fixed README spelling ((`#381 <https://github.com/fronzbot/blinkpy/pull/381>`__) via @rohitsud)
+- Fixed README spelling (`@rohitsud #381 <https://github.com/fronzbot/blinkpy/pull/381>`__)
 - Bumped pygments to 2.7.1
 - Bumped coverage to 5.3
 - Bumped pydocstyle to 5.1.1
@@ -155,19 +169,19 @@ A list of changes between each release
 
 **Breaking Changes:**
 
-- Add arm property to camera, deprecate motion enable method (`#273 <https://github.com/fronzbot/blinkpy/pull/273>`__)
-- Complete refactoring of auth logic (breaks all pre-0.16.0 setups!) (`#261 <https://github.com/fronzbot/blinkpy/pull/261>`__)
+- Add arm property to camera, deprecate motion enable method (`@fronzbot #273 <https://github.com/fronzbot/blinkpy/pull/273>`__)
+- Complete refactoring of auth logic (breaks all pre-0.16.0 setups!) (`@fronzbot #261 <https://github.com/fronzbot/blinkpy/pull/261>`__)
 
 **New Features:**
 
-- Add is_errored property to Auth class (`#275 <https://github.com/fronzbot/blinkpy/pull/275>`__)
-- Add new endpoint to get user infor (`#280 <https://github.com/fronzbot/blinkpy/pull/280>`__)
-- Add get_liveview command to camera module (`#289 <https://github.com/fronzbot/blinkpy/pull/289>`__)
-- Add blink Mini Camera support (`#290 <https://github.com/fronzbot/blinkpy/pull/290>`__)
-- Add option to skip homescreen check (`#305 <https://github.com/fronzbot/blinkpy/pull/305>`__)
-- Add different timeout for video and image retrieval (`#323 <https://github.com/fronzbot/blinkpy/pull/323>`__)
-- Modifiy session to use HTTPAdapter and handle retries (`#324 <https://github.com/fronzbot/blinkpy/pull/324>`__)
-- Add retry option overrides (`#339 <https://github.com/fronzbot/blinkpy/pull/339>`__)
+- Add is_errored property to Auth class (`@fronzbot #275 <https://github.com/fronzbot/blinkpy/pull/275>`__)
+- Add new endpoint to get user infor (`@fronzbot #280 <https://github.com/fronzbot/blinkpy/pull/280>`__)
+- Add get_liveview command to camera module (`@fronzbot #289 <https://github.com/fronzbot/blinkpy/pull/289>`__)
+- Add blink Mini Camera support (`@fronzbot #290 <https://github.com/fronzbot/blinkpy/pull/290>`__)
+- Add option to skip homescreen check (`@fronzbot #305 <https://github.com/fronzbot/blinkpy/pull/305>`__)
+- Add different timeout for video and image retrieval (`@fronzbot #323 <https://github.com/fronzbot/blinkpy/pull/323>`__)
+- Modifiy session to use HTTPAdapter and handle retries (`@fronzbot #324 <https://github.com/fronzbot/blinkpy/pull/324>`__)
+- Add retry option overrides (`@fronzbot #339 <https://github.com/fronzbot/blinkpy/pull/339>`__)
 
 **All changes:**
 
@@ -176,7 +190,7 @@ Please see the change list in the (`Release Notes <https://github.com/fronzbot/r
 
 0.15.1 (2020-07-11)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-- Bugfix: remove "Host" from auth header (`#330 <https://github.com/fronzbot/blinkpy/pull/330>`__)
+- Bugfix: remove "Host" from auth header (`@fronzbot #330 <https://github.com/fronzbot/blinkpy/pull/330>`__)
 
 
 0.15.0 (2020-05-08)
@@ -188,21 +202,21 @@ Please see the change list in the (`Release Notes <https://github.com/fronzbot/r
 
 **New Functions**
 
-- Add ``device_id`` override when logging in (for debug and to differentiate applications) (`#245 <https://github.com/fronzbot/blinkpy/pull/245>`__)
+- Add ``device_id`` override when logging in (for debug and to differentiate applications) (`@fronzbot #245 <https://github.com/fronzbot/blinkpy/pull/245>`__)
 
 This can be used by instantiating the Blink class with the ``device_id`` parameter. 
 
 **All Changes:**
 
-- Fix setup.py use of internal pip structure (`#233 <https://github.com/fronzbot/blinkpy/pull/233>`__)
-- Update python-slugify requirement from ~=3.0.2 to ~=4.0.0 (`#234 <https://github.com/fronzbot/blinkpy/pull/234>`__)
-- Update python-dateutil requirement from ~=2.8.0 to ~=2.8.1 (`#230 <https://github.com/fronzbot/blinkpy/pull/230>`__)
-- Bump requests from 2.22.0 to 2.23.0 (`#231 <https://github.com/fronzbot/blinkpy/pull/231>`__)
-- Refactor login logic in preparation for 2FA (`#241 <https://github.com/fronzbot/blinkpy/pull/241>`__)
-- Add 2FA Support (`#242 <https://github.com/fronzbot/blinkpy/pull/242>`__) (fixes (`#210 <https://github.com/fronzbot/blinkpy/pull/210>`__))
-- Re-set key_required and available variables after setup (`#245 <https://github.com/fronzbot/blinkpy/pull/245>`__) 
-- Perform system refresh after setup (`#245 <https://github.com/fronzbot/blinkpy/pull/245>`__)
-- Fix typos (`#244 <https://github.com/fronzbot/blinkpy/pull/244>`__)
+- Fix setup.py use of internal pip structure (`@fronzbot #233 <https://github.com/fronzbot/blinkpy/pull/233>`__)
+- Update python-slugify requirement from ~=3.0.2 to ~=4.0.0 (`@fronzbot #234 <https://github.com/fronzbot/blinkpy/pull/234>`__)
+- Update python-dateutil requirement from ~=2.8.0 to ~=2.8.1 (`@fronzbot #230 <https://github.com/fronzbot/blinkpy/pull/230>`__)
+- Bump requests from 2.22.0 to 2.23.0 (`@fronzbot #231 <https://github.com/fronzbot/blinkpy/pull/231>`__)
+- Refactor login logic in preparation for 2FA (`@fronzbot #241 <https://github.com/fronzbot/blinkpy/pull/241>`__)
+- Add 2FA Support (`@fronzbot #242 <https://github.com/fronzbot/blinkpy/pull/242>`__) (fixes (`#210 <https://github.com/fronzbot/blinkpy/pull/210>`__))
+- Re-set key_required and available variables after setup (`@fronzbot #245 <https://github.com/fronzbot/blinkpy/pull/245>`__) 
+- Perform system refresh after setup (`@fronzbot #245 <https://github.com/fronzbot/blinkpy/pull/245>`__)
+- Fix typos (`@fronzbot #244 <https://github.com/fronzbot/blinkpy/pull/244>`__)
 
 0.14.3 (2020-04-22)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -215,7 +229,7 @@ This can be used by instantiating the Blink class with the ``device_id`` paramet
 0.14.2 (2019-10-12)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 - Update dependencies
-- Dockerize `(@3ch01c <https://github.com/fronzbot/blinkpy/pull/198>__)`
+- Dockerize (`@3ch01c #198 <https://github.com/fronzbot/blinkpy/pull/198>`__)
 
 0.14.1 (2019-06-20)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

README.rst

@@ -148,7 +148,7 @@ Methods exist to arm/disarm the sync module, as well as enable/disable motion de
     blink.sync["SYNC MODULE NAME"].arm = True
 
     # Disarm a sync module
-    blink.sync["SYNC MODULE NAME"].disarm = False
+    blink.sync["SYNC MODULE NAME"].arm = False
 
     # Print arm status of a sync module - a system refresh should be performed first
     blink.refresh()

blinkpy/camera.py

@@ -323,15 +323,15 @@ def arm(self, value):
 
     def snap_picture(self):
         """Snap picture for a blink doorbell camera."""
-        url = f"{self.sync.urls.base_url}/api/v1/accounts/{self.sync.blink.account_id}/networks/{self.network_id}/lotus/{self.camera_id}/thumbnail"
+        url = f"{self.sync.urls.base_url}/api/v1/accounts/{self.sync.blink.account_id}/networks/{self.network_id}/doorbells/{self.camera_id}/thumbnail"
         return api.http_post(self.sync.blink, url)
 
     def get_sensor_info(self):
         """Get sensor info for blink doorbell camera."""
 
     def get_liveview(self):
         """Get liveview link."""
-        url = f"{self.sync.urls.base_url}/api/v1/accounts/{self.sync.blink.account_id}/networks/{self.network_id}/lotus/{self.camera_id}/liveview"
+        url = f"{self.sync.urls.base_url}/api/v1/accounts/{self.sync.blink.account_id}/networks/{self.network_id}/doorbells/{self.camera_id}/liveview"
         response = api.http_post(self.sync.blink, url)
         server = response["server"]
         server_split = server.split(":")

blinkpy/helpers/constants.py

@@ -4,7 +4,7 @@
 
 MAJOR_VERSION = 0
 MINOR_VERSION = 19
-PATCH_VERSION = 1
+PATCH_VERSION = 2
 
 __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": "doorbells",
+            "doorbell": "doorbells",
         }
 
     @property
@@ -124,7 +124,7 @@ def update_cameras(self, camera_type=BlinkCamera):
         """Update cameras from server."""
         type_map = {
             "mini": BlinkCameraMini,
-            "lotus": BlinkDoorbell,
+            "doorbell": BlinkDoorbell,
             "default": BlinkCamera,
         }
         try:

tests/test_sync_functions.py

@@ -170,7 +170,7 @@ def test_sync_with_mixed_cameras(self, mock_resp):
         self.blink.sync["test"].camera_list = [
             {"name": "foo", "id": 10, "type": "default"},
             {"name": "bar", "id": 11, "type": "mini"},
-            {"name": "fake", "id": 12, "type": "lotus"},
+            {"name": "fake", "id": 12, "type": "doorbell"},
         ]
 
         self.blink.homescreen = {