X-Git-Url: https://code.delx.au/webdl/blobdiff_plain/53da2736a1f1d2bd442932ec8e970fd327a785e0..e28e65545c03e6452287c6e0cb6427eff49bd358:/sbs.py

diff --git a/sbs.py b/sbs.py
index 2c77cc6..92b27cd 100644
--- a/sbs.py
+++ b/sbs.py
@@ -1,7 +1,5 @@
-#!/usr/bin/env python
-
 import requests_cache
-from common import grab_html, grab_json, grab_xml, download_hls, Node, append_to_qs
+from common import grab_html, grab_json, grab_xml, download_hls, download_mpd, Node, append_to_qs
 
 import json
 
@@ -26,14 +24,13 @@ 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 "https:" + release_url)
-        video = doc.xpath("//smil:video", namespaces=NS)[0]
-        video_url = video.attrib["src"]
-        if not video_url:
-            raise Exception("Unsupported video %s: %s" % (self.video_id, self.title))
         filename = self.title + ".ts"
-        return download_hls(filename, video_url)
+
+        hls_url = self.get_hls_url(release_url)
+        if hls_url:
+            return download_hls(filename, hls_url)
+        else:
+            return download_mpd(filename, release_url)
 
     def get_player_params(self, doc):
         for script in doc.xpath("//script"):
@@ -48,6 +45,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_hls_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):
@@ -75,6 +80,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