Disable Plus7

[webdl] / common.py

diff --git a/common.py b/common.py
index 2a5e378ad54ed906afb19b3250862858ed22853d..bfc49fc8125a18d640d10e25c74a295166c7784b 100644 (file)
--- a/common.py
+++ b/common.py
@@ -24,7 +24,7 @@ try:
 except ImportError:
     pass
 
-CACHE_DIR = os.path.expanduser("~/.cache/webdl")
+CACHE_DIR = os.path.join(os.environ.get("XDG_CACHE_HOME", os.path.expanduser("~/.cache")), "webdl")
 USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:21.0) Gecko/20100101 Firefox/21.0"
 
 class Node(object):
@@ -57,8 +57,8 @@ def load_root_node():
     import sbs
     sbs.fill_nodes(root_node)
 
-    import plus7
-    plus7.fill_nodes(root_node)
+###    import plus7
+###    plus7.fill_nodes(root_node)
 
     import brightcove
     brightcove.fill_nodes(root_node)
@@ -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(",")