From 557f21b637e60ba2f17e84cc99902770266bd117 Mon Sep 17 00:00:00 2001 From: md-reddevil Date: Sat, 17 Nov 2018 18:12:26 +0200 Subject: [PATCH 1/7] Use network_status instead of homescreen Use network_status to check if System is armed or disarmed --- blinkpy/sync_module.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/blinkpy/sync_module.py b/blinkpy/sync_module.py index d1fa668..bd0f7a6 100644 --- a/blinkpy/sync_module.py +++ b/blinkpy/sync_module.py @@ -31,6 +31,7 @@ class BlinkSyncModule(): self.host = None self.summary = None self.homescreen = None + self.network_info = None self.record_dates = {} self.videos = {} self.events = [] @@ -64,7 +65,7 @@ class BlinkSyncModule(): @property def arm(self): """Return status of sync module: armed/disarmed.""" - return self.homescreen['network']['armed'] + return self.network_info['network']['armed'] @arm.setter def arm(self, value): @@ -88,6 +89,8 @@ class BlinkSyncModule(): self.homescreen = api.request_homescreen(self.blink) + self.network_info = api.request_network_status(self.blink,self.network_id) + camera_info = self.get_camera_info() for camera_config in camera_info: name = camera_config['name'] @@ -114,6 +117,7 @@ class BlinkSyncModule(): self.events = self.get_events() self.videos = self.get_videos() self.homescreen = api.request_homescreen(self.blink) + self.network_info = api.request_network_status(self.blink,self.network_id) camera_info = self.get_camera_info() for camera_config in camera_info: name = camera_config['name'] From 4f4189933814af7c7d6fbe8e92d13d5dfdea6841 Mon Sep 17 00:00:00 2001 From: md-reddevil Date: Sat, 17 Nov 2018 18:18:57 +0200 Subject: [PATCH 2/7] fix indentation --- blinkpy/sync_module.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/blinkpy/sync_module.py b/blinkpy/sync_module.py index bd0f7a6..4f7e7ea 100644 --- a/blinkpy/sync_module.py +++ b/blinkpy/sync_module.py @@ -89,7 +89,8 @@ class BlinkSyncModule(): self.homescreen = api.request_homescreen(self.blink) - self.network_info = api.request_network_status(self.blink,self.network_id) + self.network_info = api.request_network_status(self.blink, + self.network_id) camera_info = self.get_camera_info() for camera_config in camera_info: @@ -117,7 +118,8 @@ class BlinkSyncModule(): self.events = self.get_events() self.videos = self.get_videos() self.homescreen = api.request_homescreen(self.blink) - self.network_info = api.request_network_status(self.blink,self.network_id) + self.network_info = api.request_network_status(self.blink, + self.network_id) camera_info = self.get_camera_info() for camera_config in camera_info: name = camera_config['name'] From bdc760608eece7e96e840c7096959afb79b2c580 Mon Sep 17 00:00:00 2001 From: md-reddevil Date: Sat, 17 Nov 2018 18:20:28 +0200 Subject: [PATCH 3/7] fix indentation --- blinkpy/sync_module.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/blinkpy/sync_module.py b/blinkpy/sync_module.py index 4f7e7ea..39fde82 100644 --- a/blinkpy/sync_module.py +++ b/blinkpy/sync_module.py @@ -89,8 +89,7 @@ class BlinkSyncModule(): self.homescreen = api.request_homescreen(self.blink) - self.network_info = api.request_network_status(self.blink, - self.network_id) + self.network_info = api.request_network_status(self.blink, self.network_id) camera_info = self.get_camera_info() for camera_config in camera_info: @@ -118,8 +117,7 @@ class BlinkSyncModule(): self.events = self.get_events() self.videos = self.get_videos() self.homescreen = api.request_homescreen(self.blink) - self.network_info = api.request_network_status(self.blink, - self.network_id) + self.network_info = api.request_network_status(self.blink, self.network_id) camera_info = self.get_camera_info() for camera_config in camera_info: name = camera_config['name'] From cec6035d23b6c0e04c4946fa1d28a9f6718249b2 Mon Sep 17 00:00:00 2001 From: md-reddevil <16707502+md-reddevil@users.noreply.github.com> Date: Sun, 18 Nov 2018 14:01:22 +0200 Subject: [PATCH 4/7] fix tests after API changes --- tests/test_sync_module.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_sync_module.py b/tests/test_sync_module.py index bda50fa..206a962 100644 --- a/tests/test_sync_module.py +++ b/tests/test_sync_module.py @@ -90,6 +90,7 @@ class TestBlinkSyncModule(unittest.TestCase): {}, {'devicestatus': {}}, None, + None, None ] self.blink.sync.start() From 2e5e34391372cb5b7d273194888cd5c2c1c93e3f Mon Sep 17 00:00:00 2001 From: Kevin Fronczak Date: Sun, 18 Nov 2018 14:06:21 +0200 Subject: [PATCH 5/7] Update blinkpy/sync_module.py fix linting Co-Authored-By: md-reddevil <16707502+md-reddevil@users.noreply.github.com> --- blinkpy/sync_module.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/blinkpy/sync_module.py b/blinkpy/sync_module.py index 39fde82..8b2c0e7 100644 --- a/blinkpy/sync_module.py +++ b/blinkpy/sync_module.py @@ -89,7 +89,8 @@ class BlinkSyncModule(): self.homescreen = api.request_homescreen(self.blink) - self.network_info = api.request_network_status(self.blink, self.network_id) + self.network_info = api.request_network_status(self.blink, + self.network_id) camera_info = self.get_camera_info() for camera_config in camera_info: From d17183a152f51df4abad90bb70be4975810813e8 Mon Sep 17 00:00:00 2001 From: Kevin Fronczak Date: Mon, 19 Nov 2018 12:42:54 -0500 Subject: [PATCH 6/7] Fixed broken sync module test --- tests/test_sync_module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_sync_module.py b/tests/test_sync_module.py index 206a962..07d654f 100644 --- a/tests/test_sync_module.py +++ b/tests/test_sync_module.py @@ -88,9 +88,9 @@ class TestBlinkSyncModule(unittest.TestCase): 'status': 'foobar'}}, {'event': True}, {}, + {}, {'devicestatus': {}}, None, - None, None ] self.blink.sync.start() From 3c7892385352079227c6251eb88257870bea0bb3 Mon Sep 17 00:00:00 2001 From: Kevin Fronczak Date: Mon, 19 Nov 2018 12:46:01 -0500 Subject: [PATCH 7/7] Fix linting error (line was too long) --- blinkpy/sync_module.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/blinkpy/sync_module.py b/blinkpy/sync_module.py index 8b2c0e7..c106e70 100644 --- a/blinkpy/sync_module.py +++ b/blinkpy/sync_module.py @@ -118,7 +118,8 @@ class BlinkSyncModule(): self.events = self.get_events() self.videos = self.get_videos() self.homescreen = api.request_homescreen(self.blink) - self.network_info = api.request_network_status(self.blink, self.network_id) + self.network_info = api.request_network_status(self.blink, + self.network_id) camera_info = self.get_camera_info() for camera_config in camera_info: name = camera_config['name']