Adobe HDS support for SBS

diff --git a/common.py b/common.py
index 214e0159b77e11025da3bb4560b62898cc47a572..1e84dc2974c9f892835551d88a976b7340f112f7 100644 (file)
--- a/common.py
+++ b/common.py
@@ -232,6 +232,21 @@ def convert_to_mp4(filename):
     return ext == ".mp4"
 
 
+def download_hds(filename, video_url, pvswf=None):
+    filename = sanify_filename(filename)
+    video_url = video_url.replace("http://", "hds://")
+    print "Downloading: %s" % filename
+    cmd = [
+        "livestreamer",
+        "-o", filename,
+        "%s pvswf=%s" % (video_url, pvswf),
+        "best",
+    ]
+    if exec_subprocess(cmd):
+        return convert_to_mp4(filename)
+    else:
+        return False
+
 def download_rtmp(filename, vbase, vpath, hash_url=None):
     filename = sanify_filename(filename)
     print "Downloading: %s" % filename
@@ -250,35 +265,6 @@ def download_rtmp(filename, vbase, vpath, hash_url=None):
     else:
         return False
 
-def download_urllib(filename, url, referrer=None):
-    filename = sanify_filename(filename)
-    print "Downloading: %s" % filename
-    try:
-        src = _urlopen(url, referrer)
-        dst = open(filename, "wb")
-        while True:
-            buf = src.read(1024*1024)
-            if not buf:
-                break
-            dst.write(buf)
-            sys.stdout.write(".")
-            sys.stdout.flush()
-        print
-    except KeyboardInterrupt:
-        print "\nCancelled", url
-        return False
-    finally:
-        try:
-            src.close()
-        except:
-            pass
-        try:
-            dst.close()
-        except:
-            pass
-
-    return convert_to_mp4(filename)
-
 def download_hls_get_stream(url):
     def parse_bandwidth(line):
         params = line.split(":", 1)[1].split(",")

diff --git a/sbs.py b/sbs.py
index 7796a2a6c7752421e2df8dde2a5d08c9a7d2780d..bf599417e48bd565199fcd0586a9160c282ded72 100644 (file)
--- a/sbs.py
+++ b/sbs.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from common import grab_text, grab_html, grab_json, grab_xml, download_rtmp, download_urllib, Node, append_to_qs
+from common import grab_text, grab_html, grab_json, grab_xml, download_hds, Node, append_to_qs
 
 import collections
 import urlparse
@@ -48,10 +48,9 @@ class SbsNode(Node):
         video_url = video.attrib["src"]
         if not video_url:
             raise Exception("Unsupported video '%s': %s" % (self.title, desc_url))
-        ext = urlparse.urlsplit(video_url).path.rsplit(".", 1)[1]
-        filename = self.title + "." + ext
+        filename = self.title + ".flv"
         video_url = append_to_qs(video_url, VIDEO_MAGIC)
-        return download_urllib(filename, video_url, referrer=SWF_URL)
+        return download_hds(filename, video_url, pvswf=SWF_URL)
 
 class SbsNavNode(Node):
     def __init__(self, title, parent, url):