caelebfi/blinkpy
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix thumbnails grabbing wrong date

Browse Source
This commit is contained in:
Kevin Fronczak
2018-09-24 21:24:21 -04:00
parent 6d002fc8b0
commit 9ce09b4761
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blinkpy/blinkpy.py
+4 -3
View File
@@ -194,10 +194,10 @@ class BlinkCamera():
"""Update camera information.""" """Update camera information."""
self.name = values['name'] self.name = values['name']
self._status = values['active'] self._status = values['active']
self.thumbnail = "{}{}.jpg".format(
self.urls.base_url, values['thumbnail'])
self.clip = "{}{}".format( self.clip = "{}{}".format(
self.urls.base_url, values['video']) self.urls.base_url, values['video'])
thumb_from_clip = self.clip[0:-4]
self.thumbnail = "{}.jpg".format(thumb_from_clip)
self._battery_string = values['battery'] self._battery_string = values['battery']
self.notifications = values['notifications'] self.notifications = values['notifications']
@@ -245,9 +245,10 @@ class BlinkCamera():
for element in response: for element in response:
try: try:
if str(element['device_id']) == self.id: if str(element['device_id']) == self.id:
clip = element['video']
self.thumbnail = ( self.thumbnail = (
"{}{}.jpg".format( "{}{}.jpg".format(
self.urls.base_url, element['thumbnail']) self.urls.base_url, clip[0:-4])
) )
return self.thumbnail return self.thumbnail
except KeyError: except KeyError:
tests/test_blink_cameras.py
+5 -5
View File
@@ -39,7 +39,7 @@ class TestBlinkCameraSetup(unittest.TestCase):
'name': 'foobar', 'name': 'foobar',
'armed': False, 'armed': False,
'active': 'disarmed', 'active': 'disarmed',
'thumbnail': '/test/image', 'thumbnail': '/test/clip/clip.jpg',
'video': '/test/clip/clip.mp4', 'video': '/test/clip/clip.mp4',
'temp': 70, 'temp': 70,
'battery': 3, 'battery': 3,
@@ -76,7 +76,7 @@ class TestBlinkCameraSetup(unittest.TestCase):
self.assertEqual(camera.armed, False) self.assertEqual(camera.armed, False)
self.assertEqual( self.assertEqual(
camera.thumbnail, camera.thumbnail,
"https://rest.test.{}/test/image.jpg".format(BLINK_URL) "https://rest.test.{}/test/clip/clip.jpg".format(BLINK_URL)
) )
self.assertEqual( self.assertEqual(
camera.clip, camera.clip,
@@ -93,7 +93,7 @@ class TestBlinkCameraSetup(unittest.TestCase):
camera_config = self.camera_config camera_config = self.camera_config
camera_config['active'] = 'armed' camera_config['active'] = 'armed'
camera_config['thumbnail'] = '/test2/image' camera_config['thumbnail'] = '/test2/clip.jpg'
camera_config['video'] = '/test2/clip.mp4' camera_config['video'] = '/test2/clip.mp4'
camera_config['temp'] = 60 camera_config['temp'] = 60
camera_config['battery'] = 0 camera_config['battery'] = 0
@@ -104,7 +104,7 @@ class TestBlinkCameraSetup(unittest.TestCase):
self.assertEqual(camera.armed, True) self.assertEqual(camera.armed, True)
self.assertEqual( self.assertEqual(
camera.thumbnail, camera.thumbnail,
"https://rest.test.{}/test2/image.jpg".format(BLINK_URL) "https://rest.test.{}/test2/clip.jpg".format(BLINK_URL)
) )
self.assertEqual( self.assertEqual(
camera.clip, camera.clip,
@@ -143,7 +143,7 @@ class TestBlinkCameraSetup(unittest.TestCase):
self.assertEqual(camera_attr['armed'], False) self.assertEqual(camera_attr['armed'], False)
self.assertEqual( self.assertEqual(
camera_attr['thumbnail'], camera_attr['thumbnail'],
"https://rest.test.{}/test/image.jpg".format(BLINK_URL) "https://rest.test.{}/test/clip/clip.jpg".format(BLINK_URL)
) )
self.assertEqual( self.assertEqual(
camera_attr['video'], camera_attr['video'],