Update constants.py

Updated liveview endpoint

.github/workflows/coverage.yml

@@ -33,8 +33,9 @@ jobs:
       run: |
         tox -r -e cov
     - name: Codecov
-      uses: codecov/codecov-action@v1.0.6
+      uses: codecov/codecov-action@v1
       with:
+        token: ${{ secrets.CODECOV_TOKEN }}
         flags: unittests
         file: ./coverage.xml
         name: blinkpy

.pre-commit-config.yaml

@@ -8,12 +8,12 @@ repos:
           - --quiet
         files: ^((blinkpy|tests)/.+)?[^/]+\.py$
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.2
+    rev: 3.8.3
     hooks:
       - id: flake8
         additional_dependencies:
           - flake8-docstrings==1.5.0
-          - pydocstyle==5.0.2
+          - pydocstyle==5.1.1
         files: ^(blinkpy|tests)/.+\.py$
   - repo: https://github.com/Lucas-C/pre-commit-hooks-markup
     rev: v1.0.0

blinkpy/api.py

@@ -244,9 +244,7 @@ def request_camera_liveview(blink, network, camera_id):
     :param network: Sync module network id.
     :param camera_id: Camera ID of camera to request liveview from.
     """
-    url = (
+    url = f"{blink.urls.base_url}/api/v5/accounts/{blink.account_id}/networks/{network}/cameras/{camera_id}/liveview"
-        f"{blink.urls.base_url}/api/v3/networks/{network}/cameras/{camera_id}/liveview"
-    )
     return http_post(blink, url)
 
 

blinkpy/blinkpy.py

@@ -86,6 +86,7 @@ class Blink:
             if not self.available:
                 self.setup_post_verify()
 
+            self.get_homescreen()
             for sync_name, sync_module in self.sync.items():
                 _LOGGER.debug("Attempting refresh of sync %s", sync_name)
                 sync_module.refresh(force_cache=force)

blinkpy/camera.py

@@ -98,6 +98,15 @@ class BlinkCamera:
             self.sync.blink, self.network_id, self.camera_id
         )
 
+    def get_media(self, media_type="image"):
+        """Download media (image or video)."""
+        url = self.thumbnail
+        if media_type.lower() == "video":
+            url = self.clip
+        return api.http_get(
+            self.sync.blink, url=url, stream=True, json=False, timeout=TIMEOUT_MEDIA,
+        )
+
     def snap_picture(self):
         """Take a picture with camera to create a new thumbnail."""
         return api.request_new_image(self.sync.blink, self.network_id, self.camera_id)
@@ -180,21 +189,10 @@ class BlinkCamera:
             update_cached_video = True
 
         if new_thumbnail is not None and (update_cached_image or force_cache):
-            self._cached_image = api.http_get(
+            self._cached_image = self.get_media()
-                self.sync.blink,
+
-                url=self.thumbnail,
-                stream=True,
-                json=False,
-                timeout=TIMEOUT_MEDIA,
-            )
         if clip_addr is not None and (update_cached_video or force_cache):
-            self._cached_video = api.http_get(
+            self._cached_video = self.get_media(media_type="video")
-                self.sync.blink,
-                url=self.clip,
-                stream=True,
-                json=False,
-                timeout=TIMEOUT_MEDIA,
-            )
 
     def get_liveview(self):
         """Get livewview rtsps link."""
@@ -210,7 +208,7 @@ class BlinkCamera:
         :param path: Path to write file
         """
         _LOGGER.debug("Writing image from %s to %s", self.name, path)
-        response = self._cached_image
+        response = self.get_media()
         if response.status_code == 200:
             with open(path, "wb") as imgfile:
                 copyfileobj(response.raw, imgfile)
@@ -226,7 +224,7 @@ class BlinkCamera:
         :param path: Path to write file
         """
         _LOGGER.debug("Writing video from %s to %s", self.name, path)
-        response = self._cached_video
+        response = self.get_media(media_type="video")
         if response is None:
             _LOGGER.error("No saved video exist for %s.", self.name)
             return

blinkpy/helpers/constants.py

@@ -3,8 +3,8 @@
 import os
 
 MAJOR_VERSION = 0
-MINOR_VERSION = 17
+MINOR_VERSION = 16
-PATCH_VERSION = "0.dev0"
+PATCH_VERSION = "4-rc0"
 
 __version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}.{PATCH_VERSION}"
 

requirements.txt

@@ -1,4 +1,3 @@
 python-dateutil>=2.8.1
 requests>=2.24.0
 python-slugify>=4.0.1
-testtools>=2.4.0

requirements_test.txt

@@ -1,13 +1,14 @@
 black==19.10b0
 coverage==5.3
-flake8==3.8.3
+flake8==3.8.4
 flake8-docstrings==1.5.0
-pre-commit==2.6.0
+pre-commit==2.7.1
-pylint==2.5.3
+pylint==2.6.0
-pydocstyle==5.0.2
+pydocstyle==5.1.1
-pytest==6.0.1
+pytest==6.1.1
 pytest-cov==2.10.1
 pytest-sugar==0.9.4
 pytest-timeout==1.4.2
 restructuredtext-lint==1.3.1
-pygments==2.6.1
+pygments==2.7.1
+testtools>=2.4.0

tests/test_blinkpy.py

@@ -68,7 +68,7 @@ class TestBlinkSetup(unittest.TestCase):
         self.assertEqual(self.blink.last_refresh, None)
         with mock.patch(
             "blinkpy.sync_module.BlinkSyncModule.refresh", return_value=True
-        ):
+        ), mock.patch("blinkpy.blinkpy.Blink.get_homescreen", return_value=True):
             self.blink.refresh()
 
         self.assertEqual(self.blink.last_refresh, now)