Move logic from init_livestream into request_camera_livestream

Author: mback2k

blinkpy/api.py

@@ -17,6 +17,7 @@
     OAUTH_GRANT_TYPE_REFRESH_TOKEN,
     OAUTH_SCOPE,
 )
+from blinkpy.livestream import BlinkLiveStream
 from urllib.parse import urlencode
 
 _LOGGER = logging.getLogger(__name__)
@@ -365,6 +366,20 @@ async def request_camera_liveview(blink, network, camera_id):
     return response
 
 
+async def request_camera_livestream(blink, network, camera_id):
+    """
+    Request camera livestream.
+
+    :param blink: Blink instance.
+    :param network: Sync module network id.
+    :param camera_id: Camera ID of camera to request livestream from.
+    """
+    response = await request_camera_liveview(blink, network, camera_id)
+    if not response["server"].startswith("immis://"):
+        raise NotImplementedError("Unsupported: {}".format(response["server"]))
+    return BlinkLiveStream(blink, response)
+
+
 async def request_camera_sensors(blink, network, camera_id):
     """
     Request camera sensor info for one camera.

blinkpy/camera.py

@@ -416,12 +416,9 @@ async def get_liveview(self):
 
     async def init_livestream(self):
         """Initialize livestream."""
-        response = await api.request_camera_liveview(
+        return await api.request_camera_livestream(
             self.sync.blink, self.sync.network_id, self.camera_id
         )
-        if not response["server"].startswith("immis://"):
-            raise NotImplementedError("Unsupported: {}".format(response["server"]))
-        return BlinkLiveStream(self, response)
 
     async def image_to_file(self, path):
         """