iView handle missing episodes in collection

[webdl] / sbs.py

diff --git a/sbs.py b/sbs.py
index a7c1858bc16c9e2ff9ee45a90be18350847b9857..92b27cdb307282ab8b49bbdcbddb16d5d8cfc03a 100644 (file)
--- a/sbs.py
+++ b/sbs.py
@@ -1,6 +1,5 @@
-#!/usr/bin/env python
-
-from common import grab_html, grab_json, grab_xml, download_hls, Node, append_to_qs
+import requests_cache
+from common import grab_html, grab_json, grab_xml, download_hls, download_mpd, Node, append_to_qs
 
 import json
 
@@ -20,17 +19,18 @@ 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"]
-        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"):
@@ -45,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):
@@ -71,18 +79,15 @@ 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
             for entry in entries:
                 yield entry
             offset += amount
-            import sys
-            sys.stdout.write(".")
-            sys.stdout.flush()
-        sys.stdout.write("\n")
-        sys.stdout.flush()
 
     def explode_videos_to_unique_categories(self, all_video_entries):
         for entry_data in all_video_entries: