Download regeneration works with python 2.5

This commit is contained in:
Philipp Hagemeister 2011-09-27 20:50:03 +02:00
parent a2dafa7316
commit 6e3ed6385c
2 changed files with 19 additions and 4 deletions

View File

@ -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>

View File

@ -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()