3 files changed, 43 insertions, 13 deletions
diff --git a/devscripts/gh-pages/add-version.py b/devscripts/gh-pages/add-version.py
new file mode 100755
index 000000000..6af8bb9d8
--- /dev/null
+++ b/devscripts/gh-pages/add-version.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python3
+
+import json
+import sys
+import hashlib
+import urllib.request
+
+if len(sys.argv) <= 1:
+	print('Specify the version number as parameter')
+	sys.exit()
+version = sys.argv[1]
+
+with open('update/LATEST_VERSION', 'w') as f:
+	f.write(version)
+
+versions_info = json.load(open('update/versions.json'))
+if 'signature' in versions_info:
+	del versions_info['signature']
+
+new_version = {}
+
+filenames = {'bin': 'youtube-dl', 'exe': 'youtube-dl.exe', 'tar': 'youtube-dl-%s.tar.gz' % version}
+for key, filename in filenames.items():
+	print('Downloading and checksumming %s...' %filename)
+	url = 'http://youtube-dl.org/downloads/%s/%s' % (version, filename)
+	data = urllib.request.urlopen(url).read()
+	sha256sum = hashlib.sha256(data).hexdigest()
+	new_version[key] = (url, sha256sum)
+
+versions_info['versions'][version] = new_version
+versions_info['latest'] = version
+
+json.dump(versions_info, open('update/versions.json', 'w'), indent=4, sort_keys=True)
+\ No newline at end of file
diff --git a/devscripts/gh-pages/generate-download.py b/devscripts/gh-pages/generate-download.py
index f19729f59..55912e12c 100755
--- a/devscripts/gh-pages/generate-download.py
+++ b/devscripts/gh-pages/generate-download.py
@@ -4,18 +4,13 @@ import shutil
 import subprocess
 import tempfile
 import urllib.request
+import json
 
-URL = 'https://github.com/downloads/rg3/youtube-dl/youtube-dl'
+versions_info = json.load(open('update/versions.json'))
+version = versions_info['latest']
+URL = versions_info['versions'][version]['bin'][0]
 
-with tempfile.NamedTemporaryFile(suffix='youtube-dl', delete=True) as ytdl_file:
-    with urllib.request.urlopen(URL) as dl:
-        shutil.copyfileobj(dl, ytdl_file)
-
-    ytdl_file.seek(0)
-    data = ytdl_file.read()
-
-    ytdl_file.flush()
-    version = subprocess.check_output(['python3', ytdl_file.name, '--version']).decode('ascii').strip()
+data = urllib.request.urlopen(URL).read()
 
 # Read template page
 with open('download.html.in', 'r', encoding='utf-8') as tmplf:
@@ -29,5 +24,9 @@ template = template.replace('@PROGRAM_URL@', URL)
 template = template.replace('@PROGRAM_MD5SUM@', md5sum)
 template = template.replace('@PROGRAM_SHA1SUM@', sha1sum)
 template = template.replace('@PROGRAM_SHA256SUM@', sha256sum)
+template = template.replace('@EXE_URL@', versions_info['versions'][version]['exe'][0])
+template = template.replace('@EXE_SHA256SUM@', versions_info['versions'][version]['exe'][1])
+template = template.replace('@TAR_URL@', versions_info['versions'][version]['tar'][0])
+template = template.replace('@TAR_SHA256SUM@', versions_info['versions'][version]['tar'][1])
 with open('download.html', 'w', encoding='utf-8') as dlf:
     dlf.write(template)
diff --git a/devscripts/gh-pages/sign_versions.py b/devscripts/gh-pages/sign-versions.py
index 5d94a3a03..dd126df52 100755
--- a/devscripts/gh-pages/sign_versions.py
+++ b/devscripts/gh-pages/sign-versions.py
@@ -1,15 +1,13 @@
-#! /usr/bin/env python3
+#!/usr/bin/env python3
 
 import rsa
 import json
 from binascii import hexlify
 
-# TODO path discovery
 versions_info = json.load(open('update/versions.json'))
 if 'signature' in versions_info:
 	del versions_info['signature']
 
-
 print('Enter the PKCS1 private key, followed by a blank line:')
 privkey = ''
 while True: