From: James Bunton <jamesbunton@delx.net.au>
Date: Mon, 19 Dec 2011 09:32:05 +0000 (+1100)
Subject: Added swf hash url back into iView
X-Git-Url: https://code.delx.au/webdl/commitdiff_plain/8588d09e6bcf033c73647c7e4b5f58cde2634538?hp=5cf33ad1ef4fa0066c9ade22e3e6f151dd218a99

Added swf hash url back into iView
---

diff --git a/common.py b/common.py
index 6b64896..fbc5c2a 100644
--- 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 4319543..0d2e21d 100644
--- 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):