mikhailnov
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[update] Modernize

Browse Source
master
Philipp Hagemeister 10 years ago
parent ab4ee31eb1
commit 15938ab67a
1 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File

67
youtube_dl/update.py
Unescape Escape View File

@ -1,3 +1,5 @@
from __future__ import unicode_literals
import io
import json
import traceback
@ -7,7 +9,7 @@ import subprocess
import sys
from zipimport import zipimporter
from .utils import (
from .compat import (
compat_str,
compat_urllib_request,
)
@ -19,12 +21,7 @@ def rsa_verify(message, signature, key):
from hashlib import sha256
from sys import version_info
def b(x):
if version_info[0] == 2:
return x
else:
return x.encode('latin1')
assert(type(message) == type(b('')))
assert isinstance(message, bytes)
block_size = 0
n = key[0]
while n:
@ -35,14 +32,14 @@ def rsa_verify(message, signature, key):
while signature:
raw_bytes.insert(0, pack("B", signature & 0xFF))
signature >>= 8
signature = (block_size - len(raw_bytes)) * b('\x00') + b('').join(raw_bytes)
if signature[0:2] != b('\x00\x01'):
signature = (block_size - len(raw_bytes)) * b'\x00' + b''.join(raw_bytes)
if signature[0:2] != b'\x00\x01':
return False
signature = signature[2:]
if not b('\x00') in signature:
if b'\x00' not in signature:
return False
signature = signature[signature.index(b('\x00')) + 1:]
if not signature.startswith(b('\x30\x31\x30\x0D\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x01\x05\x00\x04\x20')):
signature = signature[signature.index(b'\x00') + 1:]
if not signature.startswith(b'\x30\x31\x30\x0D\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x01\x05\x00\x04\x20'):
return False
signature = signature[19:]
if signature != sha256(message).digest():
@ -59,7 +56,7 @@ def update_self(to_screen, verbose):
UPDATES_RSA_KEY = (0x9d60ee4d8f805312fdb15a62f87b95bd66177b91df176765d13514a0f1754bcd2057295c5b6f1d35daa6742c3ffc9a82d3e118861c207995a8031e151d863c9927e304576bc80692bc8e094896fcf11b66f3e29e04e3a71e9a11558558acea1840aec37fc396fb6b65dc81a1c4144e03bd1c011de62e3f1357b327d08426fe93, 65537)
if not isinstance(globals().get('__loader__'), zipimporter) and not hasattr(sys, "frozen"):
to_screen(u'It looks like you installed youtube-dl with a package manager, pip, setup.py or a tarball. Please use that to update.')
to_screen('It looks like you installed youtube-dl with a package manager, pip, setup.py or a tarball. Please use that to update.')
return
# Check if there is a new version
@ -68,10 +65,10 @@ def update_self(to_screen, verbose):
except:
if verbose:
to_screen(compat_str(traceback.format_exc()))
to_screen(u'ERROR: can\'t find the current version. Please try again later.')
to_screen('ERROR: can\'t find the current version. Please try again later.')
return
if newversion == __version__:
to_screen(u'youtube-dl is up-to-date (' + __version__ + ')')
to_screen('youtube-dl is up-to-date (' + __version__ + ')')
return
# Download and check versions info
@ -81,15 +78,15 @@ def update_self(to_screen, verbose):
except:
if verbose:
to_screen(compat_str(traceback.format_exc()))
to_screen(u'ERROR: can\'t obtain versions info. Please try again later.')
to_screen('ERROR: can\'t obtain versions info. Please try again later.')
return
if not 'signature' in versions_info:
to_screen(u'ERROR: the versions file is not signed or corrupted. Aborting.')
to_screen('ERROR: the versions file is not signed or corrupted. Aborting.')
return
signature = versions_info['signature']
del versions_info['signature']
if not rsa_verify(json.dumps(versions_info, sort_keys=True).encode('utf-8'), signature, UPDATES_RSA_KEY):
to_screen(u'ERROR: the versions file signature is invalid. Aborting.')
to_screen('ERROR: the versions file signature is invalid. Aborting.')
return
version_id = versions_info['latest']
@ -97,10 +94,10 @@ def update_self(to_screen, verbose):
def version_tuple(version_str):
return tuple(map(int, version_str.split('.')))
if version_tuple(__version__) >= version_tuple(version_id):
to_screen(u'youtube-dl is up to date (%s)' % __version__)
to_screen('youtube-dl is up to date (%s)' % __version__)
return
to_screen(u'Updating to version ' + version_id + ' ...')
to_screen('Updating to version ' + version_id + ' ...')
version = versions_info['versions'][version_id]
print_notes(to_screen, versions_info['versions'])
@ -108,11 +105,11 @@ def update_self(to_screen, verbose):
filename = sys.argv[0]
# Py2EXE: Filename could be different
if hasattr(sys, "frozen") and not os.path.isfile(filename):
if os.path.isfile(filename + u'.exe'):
filename += u'.exe'
if os.path.isfile(filename + '.exe'):
filename += '.exe'
if not os.access(filename, os.W_OK):
to_screen(u'ERROR: no write permissions on %s' % filename)
to_screen('ERROR: no write permissions on %s' % filename)
return
# Py2EXE
@ -120,7 +117,7 @@ def update_self(to_screen, verbose):
exe = os.path.abspath(filename)
directory = os.path.dirname(exe)
if not os.access(directory, os.W_OK):
to_screen(u'ERROR: no write permissions on %s' % directory)
to_screen('ERROR: no write permissions on %s' % directory)
return
try:
@ -130,12 +127,12 @@ def update_self(to_screen, verbose):
except (IOError, OSError):
if verbose:
to_screen(compat_str(traceback.format_exc()))
to_screen(u'ERROR: unable to download latest version')
to_screen('ERROR: unable to download latest version')
return
newcontent_hash = hashlib.sha256(newcontent).hexdigest()
if newcontent_hash != version['exe'][1]:
to_screen(u'ERROR: the downloaded file hash does not match. Aborting.')
to_screen('ERROR: the downloaded file hash does not match. Aborting.')
return
try:
@ -144,27 +141,27 @@ def update_self(to_screen, verbose):
except (IOError, OSError):
if verbose:
to_screen(compat_str(traceback.format_exc()))
to_screen(u'ERROR: unable to write the new version')
to_screen('ERROR: unable to write the new version')
return
try:
bat = os.path.join(directory, 'youtube-dl-updater.bat')
with io.open(bat, 'w') as batfile:
batfile.write(u"""
batfile.write('''
@echo off
echo Waiting for file handle to be closed ...
ping 127.0.0.1 -n 5 -w 1000 > NUL
move /Y "%s.new" "%s" > NUL
echo Updated youtube-dl to version %s.
start /b "" cmd /c del "%%~f0"&exit /b"
\n""" % (exe, exe, version_id))
\n''' % (exe, exe, version_id))
subprocess.Popen([bat]) # Continues to run in the background
return # Do not show premature success messages
except (IOError, OSError):
if verbose:
to_screen(compat_str(traceback.format_exc()))
to_screen(u'ERROR: unable to overwrite current version')
to_screen('ERROR: unable to overwrite current version')
return
# Zip unix package
@ -176,12 +173,12 @@ start /b "" cmd /c del "%%~f0"&exit /b"
except (IOError, OSError):
if verbose:
to_screen(compat_str(traceback.format_exc()))
to_screen(u'ERROR: unable to download latest version')
to_screen('ERROR: unable to download latest version')
return
newcontent_hash = hashlib.sha256(newcontent).hexdigest()
if newcontent_hash != version['bin'][1]:
to_screen(u'ERROR: the downloaded file hash does not match. Aborting.')
to_screen('ERROR: the downloaded file hash does not match. Aborting.')
return
try:
@ -190,10 +187,10 @@ start /b "" cmd /c del "%%~f0"&exit /b"
except (IOError, OSError):
if verbose:
to_screen(compat_str(traceback.format_exc()))
to_screen(u'ERROR: unable to overwrite current version')
to_screen('ERROR: unable to overwrite current version')
return
to_screen(u'Updated youtube-dl. Restart youtube-dl to use the new version.')
to_screen('Updated youtube-dl. Restart youtube-dl to use the new version.')
def get_notes(versions, fromVersion):
@ -207,6 +204,6 @@ def get_notes(versions, fromVersion):
def print_notes(to_screen, versions, fromVersion=__version__):
notes = get_notes(versions, fromVersion)
if notes:
to_screen(u'PLEASE NOTE:')
to_screen('PLEASE NOTE:')
for note in notes:
to_screen(note)

Write Preview
Loading…
Cancel
Save