Merge pull request #79 from fronzbot/v0.8.2

V0.8.2

Author: fronzbot

blinkpy/blinkpy.py

@@ -194,10 +194,10 @@ def update(self, values):
         """Update camera information."""
         self.name = values['name']
         self._status = values['active']
-        self.thumbnail = "{}{}.jpg".format(
-            self.urls.base_url, values['thumbnail'])
         self.clip = "{}{}".format(
             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.notifications = values['notifications']
 
@@ -221,7 +221,8 @@ def update(self, values):
         # Check if the most recent clip is included in the last_record list
         # and that the last_record list is populated
         try:
-            new_clip = self.blink.videos[self.name][0]['clip']
+            records = sorted(self.blink.record_dates[self.name])
+            new_clip = records.pop()
             if new_clip not in self.last_record and self.last_record:
                 self.motion_detected = True
                 self.last_record.insert(0, new_clip)
@@ -244,9 +245,10 @@ def image_refresh(self):
         for element in response:
             try:
                 if str(element['device_id']) == self.id:
+                    clip = element['video']
                     self.thumbnail = (
                         "{}{}.jpg".format(
-                            self.urls.base_url, element['thumbnail'])
+                            self.urls.base_url, clip[0:-4])
                     )
                     return self.thumbnail
             except KeyError:
@@ -293,6 +295,7 @@ def __init__(self, username=None, password=None):
         self._video_count = 0
         self._all_videos = {}
         self._summary = None
+        self.record_dates = dict()
 
     @property
     def camera_thumbs(self):
@@ -376,6 +379,7 @@ def refresh(self):
     def get_videos(self, start_page=0, end_page=1):
         """Retrieve last recorded videos per camera."""
         videos = list()
+        all_dates = dict()
         for page_num in range(start_page, end_page + 1):
             this_page = self._video_request(page_num)
             if not this_page:
@@ -388,6 +392,12 @@ def get_videos(self, start_page=0, end_page=1):
                 camera_name = entry['camera_name']
                 clip_addr = entry['address']
                 thumb_addr = entry['thumbnail']
+                clip_date = clip_addr.split('_')[-6:]
+                clip_date = '_'.join(clip_date)
+                clip_date = clip_date.split('.')[0]
+                if camera_name not in all_dates:
+                    all_dates[camera_name] = list()
+                all_dates[camera_name].append(clip_date)
                 try:
                     self._all_videos[camera_name].append(
                         {
@@ -402,6 +412,7 @@ def get_videos(self, start_page=0, end_page=1):
                             'thumb': thumb_addr,
                         }
                     ]
+        self.record_dates = all_dates
 
     def get_cameras(self):
         """Find and creates cameras."""

blinkpy/helpers/constants.py

@@ -4,7 +4,7 @@
 
 MAJOR_VERSION = 0
 MINOR_VERSION = 8
-PATCH_VERSION = 1
+PATCH_VERSION = 2
 
 __version__ = '{}.{}.{}'.format(MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION)
 

tests/test_blink_cameras.py

@@ -39,7 +39,7 @@ def setUp(self):
             'name': 'foobar',
             'armed': False,
             'active': 'disarmed',
-            'thumbnail': '/test/image',
+            'thumbnail': '/test/clip/clip.jpg',
             'video': '/test/clip/clip.mp4',
             'temp': 70,
             'battery': 3,
@@ -76,7 +76,7 @@ def test_camera_properties(self, mock_get, mock_post, mock_cfg):
             self.assertEqual(camera.armed, False)
             self.assertEqual(
                 camera.thumbnail,
-                "https://rest.test.{}/test/image.jpg".format(BLINK_URL)
+                "https://rest.test.{}/test/clip/clip.jpg".format(BLINK_URL)
             )
             self.assertEqual(
                 camera.clip,
@@ -93,7 +93,7 @@ def test_camera_properties(self, mock_get, mock_post, mock_cfg):
 
         camera_config = self.camera_config
         camera_config['active'] = 'armed'
-        camera_config['thumbnail'] = '/test2/image'
+        camera_config['thumbnail'] = '/test2/clip.jpg'
         camera_config['video'] = '/test2/clip.mp4'
         camera_config['temp'] = 60
         camera_config['battery'] = 0
@@ -104,7 +104,7 @@ def test_camera_properties(self, mock_get, mock_post, mock_cfg):
             self.assertEqual(camera.armed, True)
             self.assertEqual(
                 camera.thumbnail,
-                "https://rest.test.{}/test2/image.jpg".format(BLINK_URL)
+                "https://rest.test.{}/test2/clip.jpg".format(BLINK_URL)
             )
             self.assertEqual(
                 camera.clip,
@@ -143,7 +143,7 @@ def test_camera_attributes(self, mock_cfg):
             self.assertEqual(camera_attr['armed'], False)
             self.assertEqual(
                 camera_attr['thumbnail'],
-                "https://rest.test.{}/test/image.jpg".format(BLINK_URL)
+                "https://rest.test.{}/test/clip/clip.jpg".format(BLINK_URL)
             )
             self.assertEqual(
                 camera_attr['video'],