Better error handling

Author: lindell

custom_components/svt_play/video_url_fetch/live_test.py

@@ -1,4 +1,5 @@
 from video_fetch import video_url_by_channel, video_id_by_time, video_url_by_video_id, suggested_video_id
+import pytest
 
 
 def test_rapport_by_time():
@@ -16,3 +17,18 @@ def test_rapport_by_suggested():
 def test_svt1():
     url = video_url_by_channel("svt1")
     assert url.startswith('http')
+
+
+def test_not_found_by_time():
+    with pytest.raises(Exception, match="Could not find program with id: bogus"):
+        video_id_by_time('bogus')
+
+
+def test_not_found_by_suggested():
+    with pytest.raises(Exception, match="Could not find program with id: bogus"):
+        suggested_video_id('bogus')
+
+
+def test_not_found_channel():
+    with pytest.raises(Exception, match="Could not fetch video url: Not found"):
+        video_url_by_channel("svt1337")

custom_components/svt_play/video_url_fetch/video_fetch.py

@@ -21,8 +21,10 @@ def video_url_by_channel(channel_id, formats=default_formats):
 
 def video_url_from_videoplayer_api(url, formats):
     data = get(url).json()
-    if 'msg' in data:
-        raise Exception("Could not fetch the CDN data: {}".format(data['msg']))
+    if 'message' in data:
+        raise Exception(
+            "Could not fetch video url: {}".format(data['message'])
+        )
 
     for format in formats:
         for video_reference in data['videoReferences']:
@@ -107,6 +109,11 @@ def information_by_program_id(program_id):
     }
 
     data = post('https://api.svt.se/contento/graphql', json=query_data).json()
+    if len(data['data']['listablesBySlug']) < 1:
+        raise Exception(
+            "Could not find program with id: {}".format(program_id)
+        )
+
     associated_content = data['data']['listablesBySlug'][0]
 
     return associated_content