From 1c2ec6c9c1caf77701b9ae6d263c5397749898b5 Mon Sep 17 00:00:00 2001 From: Kevin Fronczak Date: Sun, 26 Jun 2022 15:45:22 -0400 Subject: [PATCH 1/8] dev version bump --- blinkpy/helpers/constants.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blinkpy/helpers/constants.py b/blinkpy/helpers/constants.py index 43b7c605..29570b00 100644 --- a/blinkpy/helpers/constants.py +++ b/blinkpy/helpers/constants.py @@ -3,8 +3,8 @@ import os MAJOR_VERSION = 0 -MINOR_VERSION = 19 -PATCH_VERSION = 1 +MINOR_VERSION = 20 +PATCH_VERSION = "0.dev0" __version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}.{PATCH_VERSION}" From a77133b5c2ea74b6025c7c7eb4554f4d1c8e42b7 Mon Sep 17 00:00:00 2001 From: dashrb <65059254+dashrb@users.noreply.github.com> Date: Fri, 1 Jul 2022 15:21:09 -0400 Subject: [PATCH 2/8] Fix typo in README regarding disarm syntax --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index f52b8606..3934b4e7 100644 --- a/README.rst +++ b/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() From 87a87988bd57bc3d6b2e85262a5dc03a52cbfdc4 Mon Sep 17 00:00:00 2001 From: uvjim Date: Tue, 5 Jul 2022 21:50:30 +0100 Subject: [PATCH 3/8] Update sync_module.py Apologies. I missed this when submitting the last PR but had it locally for some reason. Without the change the device seems to work but gets identified as a mini and then incorrect end points are used. --- blinkpy/sync_module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blinkpy/sync_module.py b/blinkpy/sync_module.py index 64ea61ad..17682324 100644 --- a/blinkpy/sync_module.py +++ b/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 From 3952f7cd56599e49d7a9a48d7280f863877e986c Mon Sep 17 00:00:00 2001 From: uvjim Date: Tue, 5 Jul 2022 22:09:07 +0100 Subject: [PATCH 4/8] type_map update Not sure how I missed this one... --- blinkpy/sync_module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blinkpy/sync_module.py b/blinkpy/sync_module.py index 17682324..291b1067 100644 --- a/blinkpy/sync_module.py +++ b/blinkpy/sync_module.py @@ -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: From f6f35a326eeadeb0ff655a9a4551ee6f1504e479 Mon Sep 17 00:00:00 2001 From: uvjim Date: Wed, 6 Jul 2022 09:37:34 +0100 Subject: [PATCH 5/8] update test to reflect change --- tests/test_sync_functions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_sync_functions.py b/tests/test_sync_functions.py index 50da7c53..5fac66fa 100644 --- a/tests/test_sync_functions.py +++ b/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 = { From 5337c2ea982ab3d6580fe7e48097f07882ceff90 Mon Sep 17 00:00:00 2001 From: Dustin Ward Date: Wed, 13 Jul 2022 20:44:20 -0500 Subject: [PATCH 6/8] Fix the errors for the Blink doorbell camera The Blink API changed the endpoint from lotus to doorbells for the doorbell cameras. This was found by decompiling the Android APK and looking at the path for the API call. This affects both the snap_picture and get_liveview methods. --- blinkpy/camera.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blinkpy/camera.py b/blinkpy/camera.py index a80ab30d..3e8dd912 100644 --- a/blinkpy/camera.py +++ b/blinkpy/camera.py @@ -323,7 +323,7 @@ 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): @@ -331,7 +331,7 @@ def get_sensor_info(self): 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(":") From ebc95f7697d138ab77789345cd7feff3807c6870 Mon Sep 17 00:00:00 2001 From: Kevin Fronczak Date: Tue, 26 Jul 2022 11:55:24 -0400 Subject: [PATCH 7/8] Update CHANGES.rst --- CHANGES.rst | 104 +++++++++++++++++++++++++++++----------------------- 1 file changed, 59 insertions(+), 45 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index a5be972b..e1450eaa 100644 --- a/CHANGES.rst +++ b/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 `__) +- Fix the errors for the Blink doorbell camera (`@ruby-dev #603 `__) + +**Other Changes** + +- dev version bump (`@fronzbot #593 `__) +- Fix typo in README regarding disarm syntax (`@dashrb #597 `__) + + 0.19.1 (2022-06-26) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Bugfixes** -- Fix getting doorbell details (`@uvjim `__) -- Potential fix for mixed camera usage (`#590 `__) +- Fix getting doorbell details (`@uvjim #584 `__) +- Potential fix for mixed camera usage (`@fronzbot #590 `__) **Other Changes** -- doc update (`@dwaltsch `__) -- Test re-factoring (`#591 `__) +- doc update (`@dwaltsch #579 `__) +- Test re-factoring (`@fronzbot #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 `__) -- Fix issue with malformed thumbnails (`#550 `__) -- Fully support new thumbnail API (`@gdoermann `__) +- Debug log in prase download method fix (`@tieum #540 `__) +- Fix issue with malformed thumbnails (`@fronzbot #550 `__) +- Fully support new thumbnail API (`@gdoermann #552 `__) **New Features:** -- Support for arm/disarm of Blink Mini cameras (`@mstratford `__) -- Add product_type to BlinkCamera class to report type of camera (`#553 `__) -- Remove python 3.6 support, add python 3.10 support (`#554 `__) +- Support for arm/disarm of Blink Mini cameras (`@mstratford #546 `__) +- Add product_type to BlinkCamera class to report type of camera (`@fronzbot #553 `__) +- Remove python 3.6 support, add python 3.10 support (`@fronzbot #554 `__) **Other:** -- Make code that determines need for unique class (Mini + Doorbells) generic (`#553 `__) +- Make code that determines need for unique class (Mini + Doorbells) generic (`@fronzbot #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 `__) +- Support for Blink Doorbell (`@magicalyak #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 `__) +- Add delay parameter to Blink.download_videos method in order to throttle API during video retrieval (`@fronzbot #437 `__) - Bump pylint to 2.6.2 @@ -83,13 +97,13 @@ A list of changes between each release **Bugfixes:** -- Fix video downloading bug (`#424 `__) -- Fix repeated authorization email bug (`#432 `__ and `#428 `__) +- Fix video downloading bug (`@fronzbot #424 `__) +- Fix repeated authorization email bug (`@fronzbot #432 `__ and `@fronzbot #428 `__) **New Features:** -- Add logout method (`#429 `__) -- Add camera record method (`#430 `__) +- Add logout method (`@fronzbot #429 `__) +- Add camera record method (`@fronzbot #430 `__) **Other:** @@ -109,18 +123,18 @@ A list of changes between each release **Bugfixes:** -- Updated liveview endpoint (`#389 `__) -- Fixed mini thumbnail not updating (`#388 `__) -- Add exception catch to prevent NoneType error on refresh, added test to check behavior as well (`#401 `__) +- Updated liveview endpoint (`@fronzbot #389 `__) +- Fixed mini thumbnail not updating (`@fronzbot #388 `__) +- Add exception catch to prevent NoneType error on refresh, added test to check behavior as well (`@fronzbot #401 `__) - Unrelated: had to add two force methods to refresh for testing purposes. Should not change normal usage. -- Fix malformed stream url (`#395 `__) +- Fix malformed stream url (`@fronzbot #395 `__) **All:** -- Moved testtools to requirements_test.txt (`#387 `__) +- Moved testtools to requirements_test.txt (`@fronzbot #387 `__) - Bumped pytest to 6.1.1 - Bumped flake8 to 3.8.4 -- Fixed README spelling ((`#381 `__) via @rohitsud) +- Fixed README spelling (`@rohitsud #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 `__) -- Complete refactoring of auth logic (breaks all pre-0.16.0 setups!) (`#261 `__) +- Add arm property to camera, deprecate motion enable method (`@fronzbot #273 `__) +- Complete refactoring of auth logic (breaks all pre-0.16.0 setups!) (`@fronzbot #261 `__) **New Features:** -- Add is_errored property to Auth class (`#275 `__) -- Add new endpoint to get user infor (`#280 `__) -- Add get_liveview command to camera module (`#289 `__) -- Add blink Mini Camera support (`#290 `__) -- Add option to skip homescreen check (`#305 `__) -- Add different timeout for video and image retrieval (`#323 `__) -- Modifiy session to use HTTPAdapter and handle retries (`#324 `__) -- Add retry option overrides (`#339 `__) +- Add is_errored property to Auth class (`@fronzbot #275 `__) +- Add new endpoint to get user infor (`@fronzbot #280 `__) +- Add get_liveview command to camera module (`@fronzbot #289 `__) +- Add blink Mini Camera support (`@fronzbot #290 `__) +- Add option to skip homescreen check (`@fronzbot #305 `__) +- Add different timeout for video and image retrieval (`@fronzbot #323 `__) +- Modifiy session to use HTTPAdapter and handle retries (`@fronzbot #324 `__) +- Add retry option overrides (`@fronzbot #339 `__) **All changes:** @@ -176,7 +190,7 @@ Please see the change list in the (`Release Notes `__) +- Bugfix: remove "Host" from auth header (`@fronzbot #330 `__) 0.15.0 (2020-05-08) @@ -188,21 +202,21 @@ Please see the change list in the (`Release Notes `__) +- Add ``device_id`` override when logging in (for debug and to differentiate applications) (`@fronzbot #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 `__) -- Update python-slugify requirement from ~=3.0.2 to ~=4.0.0 (`#234 `__) -- Update python-dateutil requirement from ~=2.8.0 to ~=2.8.1 (`#230 `__) -- Bump requests from 2.22.0 to 2.23.0 (`#231 `__) -- Refactor login logic in preparation for 2FA (`#241 `__) -- Add 2FA Support (`#242 `__) (fixes (`#210 `__)) -- Re-set key_required and available variables after setup (`#245 `__) -- Perform system refresh after setup (`#245 `__) -- Fix typos (`#244 `__) +- Fix setup.py use of internal pip structure (`@fronzbot #233 `__) +- Update python-slugify requirement from ~=3.0.2 to ~=4.0.0 (`@fronzbot #234 `__) +- Update python-dateutil requirement from ~=2.8.0 to ~=2.8.1 (`@fronzbot #230 `__) +- Bump requests from 2.22.0 to 2.23.0 (`@fronzbot #231 `__) +- Refactor login logic in preparation for 2FA (`@fronzbot #241 `__) +- Add 2FA Support (`@fronzbot #242 `__) (fixes (`#210 `__)) +- Re-set key_required and available variables after setup (`@fronzbot #245 `__) +- Perform system refresh after setup (`@fronzbot #245 `__) +- Fix typos (`@fronzbot #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 __)` +- Dockerize (`@3ch01c #198 `__) 0.14.1 (2019-06-20) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ From 8f8f8d63ed705b4087e7ea808b32089913238b3a Mon Sep 17 00:00:00 2001 From: Kevin Fronczak Date: Tue, 26 Jul 2022 11:55:50 -0400 Subject: [PATCH 8/8] Version bump --- blinkpy/helpers/constants.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blinkpy/helpers/constants.py b/blinkpy/helpers/constants.py index 29570b00..2ef087b6 100644 --- a/blinkpy/helpers/constants.py +++ b/blinkpy/helpers/constants.py @@ -3,8 +3,8 @@ import os MAJOR_VERSION = 0 -MINOR_VERSION = 20 -PATCH_VERSION = "0.dev0" +MINOR_VERSION = 19 +PATCH_VERSION = 2 __version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}.{PATCH_VERSION}"