Added swf hash url back into iView

diff --git a/common.py b/common.py
index 6b6489657b1432dde32d2166e2603a96e97d3cb5..fbc5c2a4269dd41695ffa914e7efbb4c5a4efb5b 100644 (file)
--- a/common.py
+++ b/common.py
@@ -88,7 +88,7 @@ def grab_json(url, max_age):
        f.close()
        return doc
 
-def download_rtmp(filename, vbase, vpath):
+def download_rtmp(filename, vbase, vpath, hash_url=None):
        if vpath.endswith(".flv"):
                vpath = vpath[:-4]
        cmd = [
@@ -97,6 +97,8 @@ def download_rtmp(filename, vbase, vpath):
                "-r", vbase,
                "-y", vpath,
        ]
+       if hash_url is not None:
+               cmd += ["--swfVfy", hash_url]
        try:
                p = subprocess.Popen(cmd)
                ret = p.wait()

diff --git a/iview.py b/iview.py
index 4319543d6edfa6834242f0451e689a986ebc63c9..0d2e21d54a764d5a8f606fcc0766bc35f9e413bf 100644 (file)
--- a/iview.py
+++ b/iview.py
@@ -25,7 +25,7 @@ class IviewNode(Node):
                vpath, ext = self.vpath.rsplit(".", 1)
                vpath = ext + ":" + vpath
                filename = self.title + "." + ext
-               download_rtmp(filename, vbase, vpath)
+               download_rtmp(filename, vbase, vpath, HASH_URL)
        
 
 def fill_nodes(root_node):