diff options
author | Philipp Hagemeister <phihag@phihag.de> | 2011-09-27 20:50:03 +0200 |
---|---|---|
committer | Philipp Hagemeister <phihag@phihag.de> | 2011-09-27 20:50:03 +0200 |
commit | 6e3ed6385c70b4f1f5a170294f140b4043ec811e (patch) | |
tree | 4613749354d6bc36cc44a6d0147e6aafd1368e21 | |
parent | a2dafa7316bb6f6971fa8db77d7112dafbac09df (diff) | |
download | youtube-dl-6e3ed6385c70b4f1f5a170294f140b4043ec811e.tar.gz youtube-dl-6e3ed6385c70b4f1f5a170294f140b4043ec811e.tar.xz youtube-dl-6e3ed6385c70b4f1f5a170294f140b4043ec811e.zip |
Download regeneration works with python 2.5
-rw-r--r-- | download.html | 6 | ||||
-rwxr-xr-x | generate-download | 17 |
2 files changed, 19 insertions, 4 deletions
diff --git a/download.html b/download.html index 92e0a9b19..0259377c1 100644 --- a/download.html +++ b/download.html @@ -25,6 +25,10 @@ <li><strong>SHA256</strong>: 41c69a36c0a0d9e663d511765d1731a63a4f8aacbef5bead3501437422f16cac</li> </ul> -<div class="note">Copyright © 2006-2011 Ricardo Garcia Gonzalez</div> +<div class="note"> +<a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/"> +<img alt="Creative Commons License" style="border-width:0" +src="http://i.creativecommons.org/l/by-nc-sa/3.0/80x15.png" /></a><br /> +Copyright © 2006-2011 Ricardo Garcia Gonzalez</div> </body> </html> diff --git a/generate-download b/generate-download index d6d5d42de..002a3ceb4 100755 --- a/generate-download +++ b/generate-download @@ -1,7 +1,17 @@ #!/usr/bin/env python import hashlib -import subprocess import os.path +import subprocess + +try: + from subprocess import check_output +except ImportError: # Python < 2.7 + def check_output(*args, **kwargs): + p = subprocess.Popen(*args, stdout=subprocess.PIPE, **kwargs) + out,err = p.communicate() + if p.returncode != 0: + raise subprocess.CalledProcessError(p.returncode, p.args) + return out youtubeDlDir = os.path.join(os.path.dirname(__file__), '..', 'youtube-dl') @@ -9,8 +19,9 @@ youtubeDlDir = os.path.join(os.path.dirname(__file__), '..', 'youtube-dl') template = file('download.html.in', 'r').read() # Build replacement strings -version = subprocess.check_output([os.path.join(youtubeDlDir, 'youtube-dl'), '--version']).strip() -data = subprocess.check_output(['git', 'show', '%s:youtube-dl' % version], cwd=youtubeDlDir) +version = check_output([os.path.join(youtubeDlDir, 'youtube-dl'), '--version']).strip() +data = check_output(['git', 'show', '%s:youtube-dl' % version], cwd=youtubeDlDir) + url = 'https://github.com/rg3/youtube-dl/raw/%s/youtube-dl' % version md5sum = hashlib.md5(data).hexdigest() sha1sum = hashlib.sha1(data).hexdigest() |