Fix extraction from youtube.

[youtubedl] / devscripts / gh-pages / add-version.py

diff --git a/devscripts/gh-pages/add-version.py b/devscripts/gh-pages/add-version.py
index 6af8bb9d84196b92a9b5162b52173741ffd31b0c..867ea0048fb88f1ca1382f11b1c60b17110d4fc8 100755 (executable)
--- a/devscripts/gh-pages/add-version.py
+++ b/devscripts/gh-pages/add-version.py
@@ -1,33 +1,43 @@
 #!/usr/bin/env python3
 #!/usr/bin/env python3

+from __future__ import unicode_literals

 
 import json
 import sys
 import hashlib
 
 import json
 import sys
 import hashlib

-import urllib.request
+import os.path
+

 
 if len(sys.argv) <= 1:
 
 if len(sys.argv) <= 1:

-       print('Specify the version number as parameter')
-       sys.exit()
+    print('Specify the version number as parameter')
+    sys.exit()

 version = sys.argv[1]
 
 with open('update/LATEST_VERSION', 'w') as f:
 version = sys.argv[1]
 
 with open('update/LATEST_VERSION', 'w') as f:

-       f.write(version)
+    f.write(version)

 
 versions_info = json.load(open('update/versions.json'))
 if 'signature' in versions_info:
 
 versions_info = json.load(open('update/versions.json'))
 if 'signature' in versions_info:

-       del versions_info['signature']
+    del versions_info['signature']

 
 new_version = {}
 
 
 new_version = {}
 

-filenames = {'bin': 'youtube-dl', 'exe': 'youtube-dl.exe', 'tar': 'youtube-dl-%s.tar.gz' % version}
+filenames = {
+    'bin': 'youtube-dl',
+    'exe': 'youtube-dl.exe',
+    'tar': 'youtube-dl-%s.tar.gz' % version}
+build_dir = os.path.join('..', '..', 'build', version)

 for key, filename in filenames.items():
 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)
+    url = 'https://yt-dl.org/downloads/%s/%s' % (version, filename)
+    fn = os.path.join(build_dir, filename)
+    with open(fn, 'rb') as f:
+        data = f.read()
+    if not data:
+        raise ValueError('File %s is empty!' % fn)
+    sha256sum = hashlib.sha256(data).hexdigest()
+    new_version[key] = (url, sha256sum)

 
 versions_info['versions'][version] = new_version
 versions_info['latest'] = version
 
 
 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
+with open('update/versions.json', 'w') as jsonf:
+    json.dump(versions_info, jsonf, indent=4, sort_keys=True)