diff --git a/blinkpy.py b/blinkpy.py index e0d2228..20e599d 100644 --- a/blinkpy.py +++ b/blinkpy.py @@ -17,7 +17,7 @@ import requests import getpass import json -__version__ = '0.4.1' +__version__ = '0.4.2' BLINK_URL = 'immedia-semi.com' LOGIN_URL = 'https://prod.' + BLINK_URL + '/login' @@ -262,7 +262,7 @@ class Blink(object): """Gets all events on server""" url = BASE_URL + '/events/network/' + self._NETWORKID headers = self._AUTH_HEADER - self._EVENTS = _request(url, headers=headers, type='get')['events'] + self._EVENTS = _request(url, headers=headers, type='get')['event'] return self._EVENTS @property diff --git a/tests/test_const.py b/tests/test_const.py index f380274..f0dd330 100644 --- a/tests/test_const.py +++ b/tests/test_const.py @@ -18,6 +18,7 @@ THUMB = '/url/camera/7777/clip' THUMB2 = '/url/camera/8888/clip' NOTIFS = 1 NOTIFS2 = 1 +SYNC_ID = 0000 if ISONLINE: ONLINE = 'online' @@ -63,7 +64,7 @@ response = {'account': {'notifications': 1}, {'updated_at': '2017-01-26T19:32:10+00:00', 'device_type': 'sync_module', 'notifications': 0, - 'device_id': 0000, + 'device_id': SYNC_ID, 'status': 'online', 'last_hb': @@ -78,12 +79,80 @@ response = {'account': {'notifications': 1}, 'name': 'Blink', 'notifications': NOTIFS, 'status': 'ok'}, - 'events': [{'camera_id':DEVICE_ID, - 'type':'motion', - 'video_url':THUMB + '.mp4', - 'created_at':'2017-01-01'}, - {'camera_id':DEVICE_ID2, - 'type':'None'}], + + 'event': [{'camera_name': CAMERA_NAME, + 'updated_at': '2017-01-28T19:51:52+00:00', + 'sync_module_id': None, + 'camera': DEVICE_ID, + 'type': 'motion', + 'duration': None, + 'status': None, + 'created_at': '2017-01-28T19:51:52+00:00', + 'camera_id': DEVICE_ID, + 'id': 123456789, + 'siren_id': None, + 'account_id': ACCOUNT_ID, + 'notified': True, + 'siren': None, + 'syncmodule': None, + 'video_url': THUMB+'.mp4', + 'command_id': None, + 'network_id': None, + 'account': ACCOUNT_ID, + 'video_id': 100000001}, + {'updated_at': '2017-01-28T19:51:29+00:00', + 'sync_module_id': SYNC_ID, + 'camera': None, + 'type': 'armed', + 'duration': None, + 'status': None, + 'created_at': + '2017-01-28T19:51:29+00:00', + 'camera_id': None, + 'id': 123456789, + 'siren_id': None, + 'account_id': ACCOUNT_ID, + 'notified': False, + 'siren': None, + 'syncmodule': SYNC_ID, + 'command_id': None, + 'network_id': None, + 'account': ACCOUNT_ID}, + {'updated_at': '2017-01-28T19:00:12+00:00', + 'sync_module_id': SYNC_ID, + 'camera': None, + 'type': 'disarmed', + 'duration': None, + 'status': None, + 'created_at': '2017-01-28T19:00:12+00:00', + 'camera_id': None, + 'id': 123456789, + 'siren_id': None, + 'account_id': 2463, + 'notified': False, + 'siren': None, + 'syncmodule': SYNC_ID, + 'command_id': None, + 'network_id': None, + 'account': ACCOUNT_ID}, + {'camera_name': CAMERA_NAME, + 'updated_at': '2017-01-28T18:59:55+00:00', + 'sync_module_id': None, + 'camera': DEVICE_ID, + 'type': 'motion', + 'duration': None, + 'status': None, + 'created_at': '2017-01-28T18:59:55+00:00', + 'camera_id': DEVICE_ID, + 'id': 123456789, + 'siren_id': None, + 'account_id': ACCOUNT_ID, + 'notified': True, + 'siren': None, + 'syncmodule': None, + 'command_id': None, + 'network_id': None, + 'account': ACCOUNT_ID}], 'syncmodule':{'name':'SyncName', 'status':ONLINE}} \ No newline at end of file