sbs: always access release_url over http

[webdl] / sbs.py

diff --git a/sbs.py b/sbs.py
index 568ef60ee1d9e5ce8546e30e56c7247edd4c7050..a26316858846a7c2c3073665639aa301c07b22dc 100644 (file)
--- a/sbs.py
+++ b/sbs.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python
-
+import requests_cache
 from common import grab_html, grab_json, grab_xml, download_hls, Node, append_to_qs
 
 import json
@@ -20,13 +19,12 @@ class SbsVideoNode(Node):
         self.can_download = True
 
     def download(self):
-        doc = grab_html(VIDEO_URL % self.video_id, 0)
+        with requests_cache.disabled():
+            doc = grab_html(VIDEO_URL % self.video_id)
         player_params = self.get_player_params(doc)
         release_url = player_params["releaseUrls"]["html"]
 
-        doc = grab_xml(release_url, 0)
-        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"
@@ -45,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):
@@ -71,7 +77,9 @@ class SbsRootNode(SbsNavNode):
         amount = 500
         while True:
             url = append_to_qs(FULL_VIDEO_LIST, {"range": "%s-%s" % (offset, offset+amount)})
-            data = grab_json(url, 3600)
+            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