Switch to streamlink

[webdl] / sbs.py

diff --git a/sbs.py b/sbs.py
index 5304c4ca66d0f1f4d8189ad8d5161c6760d7c7af..a26316858846a7c2c3073665639aa301c07b22dc 100644 (file)
--- a/sbs.py
+++ b/sbs.py
@@ -24,10 +24,7 @@ class SbsVideoNode(Node):
         player_params = self.get_player_params(doc)
         release_url = player_params["releaseUrls"]["html"]
 
-        with requests_cache.disabled():
-            doc = grab_xml(release_url if not release_url.startswith("//") else "http:" + release_url)
-        video = doc.xpath("//smil:video", namespaces=NS)[0]
-        video_url = video.attrib["src"]
+        video_url = self.get_video_url(release_url)
         if not video_url:
             raise Exception("Unsupported video %s: %s" % (self.video_id, self.title))
         filename = self.title + ".ts"
@@ -46,6 +43,14 @@ class SbsVideoNode(Node):
                         return json.loads(line[p1:p2])
         raise Exception("Unable to find player params for %s: %s" % (self.video_id, self.title))
 
+    def get_video_url(self, release_url):
+        with requests_cache.disabled():
+            doc = grab_xml("http:" + release_url.replace("http:", "").replace("https:", ""))
+            video = doc.xpath("//smil:video", namespaces=NS)
+            if not video:
+                return
+            video_url = video[0].attrib["src"]
+            return video_url
 
 class SbsNavNode(Node):
     def create_video_node(self, entry_data):
@@ -73,6 +78,8 @@ class SbsRootNode(SbsNavNode):
         while True:
             url = append_to_qs(FULL_VIDEO_LIST, {"range": "%s-%s" % (offset, offset+amount)})
             data = grab_json(url)
+            if "entries" not in data:
+                raise Exception("Missing data in SBS response", data)
             entries = data["entries"]
             if len(entries) == 0:
                 break