Download regeneration works with python 2.5
This commit is contained in:
		
							parent
							
								
									a2dafa7316
								
							
						
					
					
						commit
						6e3ed6385c
					
				
					 2 changed files with 19 additions and 4 deletions
				
			
		| 
						 | 
					@ -25,6 +25,10 @@
 | 
				
			||||||
<li><strong>SHA256</strong>: 41c69a36c0a0d9e663d511765d1731a63a4f8aacbef5bead3501437422f16cac</li>
 | 
					<li><strong>SHA256</strong>: 41c69a36c0a0d9e663d511765d1731a63a4f8aacbef5bead3501437422f16cac</li>
 | 
				
			||||||
</ul>
 | 
					</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>
 | 
					</body>
 | 
				
			||||||
</html>
 | 
					</html>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,17 @@
 | 
				
			||||||
#!/usr/bin/env python
 | 
					#!/usr/bin/env python
 | 
				
			||||||
import hashlib
 | 
					import hashlib
 | 
				
			||||||
import subprocess
 | 
					 | 
				
			||||||
import os.path
 | 
					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')
 | 
					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()
 | 
					template = file('download.html.in', 'r').read()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Build replacement strings
 | 
					# Build replacement strings
 | 
				
			||||||
version = subprocess.check_output([os.path.join(youtubeDlDir, 'youtube-dl'), '--version']).strip()
 | 
					version = check_output([os.path.join(youtubeDlDir, 'youtube-dl'), '--version']).strip()
 | 
				
			||||||
data = subprocess.check_output(['git', 'show', '%s:youtube-dl' % version], cwd=youtubeDlDir)
 | 
					data = check_output(['git', 'show', '%s:youtube-dl' % version], cwd=youtubeDlDir)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
url = 'https://github.com/rg3/youtube-dl/raw/%s/youtube-dl' % version
 | 
					url = 'https://github.com/rg3/youtube-dl/raw/%s/youtube-dl' % version
 | 
				
			||||||
md5sum = hashlib.md5(data).hexdigest()
 | 
					md5sum = hashlib.md5(data).hexdigest()
 | 
				
			||||||
sha1sum = hashlib.sha1(data).hexdigest()
 | 
					sha1sum = hashlib.sha1(data).hexdigest()
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue