Madeorsk/youtube-dl
1
0
Fork 0
mirror of https://codeberg.org/polarisfm/youtube-dl synced 2024-11-26 10:24:33 +01:00
Code Issues Releases Wiki Activity

Updated __init__.py and update.py in order for update.py to write errors to stderr as opposed to stdout and return exit code of 1.

Browse Source
This commit is contained in:
Joshua Walden 2020-03-31 20:11:55 -05:00 committed by Joshua Walden
parent 2791e80b60
commit a34f1a55ce
2 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/__init__.py
View File

@ -441,7 +441,9 @@ def _real_main(argv=None):
with YoutubeDL(ydl_opts) as ydl: with YoutubeDL(ydl_opts) as ydl:
# Update version # Update version
if opts.update_self: if opts.update_self:
update_self(ydl.to_screen, opts.verbose, ydl._opener) retcode = update_self(ydl.to_stderr, ydl.to_screen, opts.verbose, ydl._opener)
if retcode is not None:
sys.exit(retcode)
# Remove cache dir # Remove cache dir
if opts.rm_cachedir: if opts.rm_cachedir:

72
youtube_dl/update.py
View File

@ -29,7 +29,7 @@ def rsa_verify(message, signature, key):
return expected == signature return expected == signature
def update_self(to_screen, verbose, opener): def update_self(to_stderr, to_screen, verbose, opener):
"""Update the program file with the latest version from the repository""" """Update the program file with the latest version from the repository"""
UPDATE_URL = 'https://yt-dl.org/update/' UPDATE_URL = 'https://yt-dl.org/update/'
@ -38,17 +38,17 @@ def update_self(to_screen, verbose, opener):
UPDATES_RSA_KEY = (0x9d60ee4d8f805312fdb15a62f87b95bd66177b91df176765d13514a0f1754bcd2057295c5b6f1d35daa6742c3ffc9a82d3e118861c207995a8031e151d863c9927e304576bc80692bc8e094896fcf11b66f3e29e04e3a71e9a11558558acea1840aec37fc396fb6b65dc81a1c4144e03bd1c011de62e3f1357b327d08426fe93, 65537) UPDATES_RSA_KEY = (0x9d60ee4d8f805312fdb15a62f87b95bd66177b91df176765d13514a0f1754bcd2057295c5b6f1d35daa6742c3ffc9a82d3e118861c207995a8031e151d863c9927e304576bc80692bc8e094896fcf11b66f3e29e04e3a71e9a11558558acea1840aec37fc396fb6b65dc81a1c4144e03bd1c011de62e3f1357b327d08426fe93, 65537)
if not isinstance(globals().get('__loader__'), zipimporter) and not hasattr(sys, 'frozen'): if not isinstance(globals().get('__loader__'), zipimporter) and not hasattr(sys, 'frozen'):
to_screen('It looks like you installed youtube-dl with a package manager, pip, setup.py or a tarball. Please use that to update.') to_stderr('It looks like you installed youtube-dl with a package manager, pip, setup.py or a tarball. Please use that to update.')
return return 1
# Check if there is a new version # Check if there is a new version
try: try:
newversion = opener.open(VERSION_URL).read().decode('utf-8').strip() newversion = opener.open(VERSION_URL).read().decode('utf-8').strip()
except Exception: except Exception:
if verbose: if verbose:
to_screen(encode_compat_str(traceback.format_exc())) to_stderr(encode_compat_str(traceback.format_exc()))
to_screen('ERROR: can\'t find the current version. Please try again later.') to_stderr('ERROR: can\'t find the current version. Please try again later.')
return return 1
if newversion == __version__: if newversion == __version__:
to_screen('youtube-dl is up-to-date (' + __version__ + ')') to_screen('youtube-dl is up-to-date (' + __version__ + ')')
return return
@ -59,17 +59,17 @@ def update_self(to_screen, verbose, opener):
versions_info = json.loads(versions_info) versions_info = json.loads(versions_info)
except Exception: except Exception:
if verbose: if verbose:
to_screen(encode_compat_str(traceback.format_exc())) to_stderr(encode_compat_str(traceback.format_exc()))
to_screen('ERROR: can\'t obtain versions info. Please try again later.') to_stderr('ERROR: can\'t obtain versions info. Please try again later.')
return return 1
if 'signature' not in versions_info: if 'signature' not in versions_info:
to_screen('ERROR: the versions file is not signed or corrupted. Aborting.') to_stderr('ERROR: the versions file is not signed or corrupted. Aborting.')
return return 1
signature = versions_info['signature'] signature = versions_info['signature']
del 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): if not rsa_verify(json.dumps(versions_info, sort_keys=True).encode('utf-8'), signature, UPDATES_RSA_KEY):
to_screen('ERROR: the versions file signature is invalid. Aborting.') to_stderr('ERROR: the versions file signature is invalid. Aborting.')
return return 1
version_id = versions_info['latest'] version_id = versions_info['latest']
@ -90,16 +90,16 @@ def update_self(to_screen, verbose, opener):
filename = compat_realpath(sys.executable if hasattr(sys, 'frozen') else sys.argv[0]) filename = compat_realpath(sys.executable if hasattr(sys, 'frozen') else sys.argv[0])
if not os.access(filename, os.W_OK): if not os.access(filename, os.W_OK):
to_screen('ERROR: no write permissions on %s' % filename) to_stderr('ERROR: no write permissions on %s' % filename)
return return 1
# Py2EXE # Py2EXE
if hasattr(sys, 'frozen'): if hasattr(sys, 'frozen'):
exe = filename exe = filename
directory = os.path.dirname(exe) directory = os.path.dirname(exe)
if not os.access(directory, os.W_OK): if not os.access(directory, os.W_OK):
to_screen('ERROR: no write permissions on %s' % directory) to_stderr('ERROR: no write permissions on %s' % directory)
return return 1
try: try:
urlh = opener.open(version['exe'][0]) urlh = opener.open(version['exe'][0])
@ -107,23 +107,23 @@ def update_self(to_screen, verbose, opener):
urlh.close() urlh.close()
except (IOError, OSError): except (IOError, OSError):
if verbose: if verbose:
to_screen(encode_compat_str(traceback.format_exc())) to_stderr(encode_compat_str(traceback.format_exc()))
to_screen('ERROR: unable to download latest version') to_stderr('ERROR: unable to download latest version')
return return 1
newcontent_hash = hashlib.sha256(newcontent).hexdigest() newcontent_hash = hashlib.sha256(newcontent).hexdigest()
if newcontent_hash != version['exe'][1]: if newcontent_hash != version['exe'][1]:
to_screen('ERROR: the downloaded file hash does not match. Aborting.') to_stderr('ERROR: the downloaded file hash does not match. Aborting.')
return return 1
try: try:
with open(exe + '.new', 'wb') as outf: with open(exe + '.new', 'wb') as outf:
outf.write(newcontent) outf.write(newcontent)
except (IOError, OSError): except (IOError, OSError):
if verbose: if verbose:
to_screen(encode_compat_str(traceback.format_exc())) to_stderr(encode_compat_str(traceback.format_exc()))
to_screen('ERROR: unable to write the new version') to_stderr('ERROR: unable to write the new version')
return return 1
try: try:
bat = os.path.join(directory, 'youtube-dl-updater.bat') bat = os.path.join(directory, 'youtube-dl-updater.bat')
@ -141,9 +141,9 @@ start /b "" cmd /c del "%%~f0"&exit /b"
return # Do not show premature success messages return # Do not show premature success messages
except (IOError, OSError): except (IOError, OSError):
if verbose: if verbose:
to_screen(encode_compat_str(traceback.format_exc())) to_stderr(encode_compat_str(traceback.format_exc()))
to_screen('ERROR: unable to overwrite current version') to_stderr('ERROR: unable to overwrite current version')
return return 1
# Zip unix package # Zip unix package
elif isinstance(globals().get('__loader__'), zipimporter): elif isinstance(globals().get('__loader__'), zipimporter):
@ -153,23 +153,23 @@ start /b "" cmd /c del "%%~f0"&exit /b"
urlh.close() urlh.close()
except (IOError, OSError): except (IOError, OSError):
if verbose: if verbose:
to_screen(encode_compat_str(traceback.format_exc())) to_stderr(encode_compat_str(traceback.format_exc()))
to_screen('ERROR: unable to download latest version') to_stderr('ERROR: unable to download latest version')
return return 1
newcontent_hash = hashlib.sha256(newcontent).hexdigest() newcontent_hash = hashlib.sha256(newcontent).hexdigest()
if newcontent_hash != version['bin'][1]: if newcontent_hash != version['bin'][1]:
to_screen('ERROR: the downloaded file hash does not match. Aborting.') to_stderr('ERROR: the downloaded file hash does not match. Aborting.')
return return 1
try: try:
with open(filename, 'wb') as outf: with open(filename, 'wb') as outf:
outf.write(newcontent) outf.write(newcontent)
except (IOError, OSError): except (IOError, OSError):
if verbose: if verbose:
to_screen(encode_compat_str(traceback.format_exc())) to_stderr(encode_compat_str(traceback.format_exc()))
to_screen('ERROR: unable to overwrite current version') to_stderr('ERROR: unable to overwrite current version')
return return 1
to_screen('Updated youtube-dl. Restart youtube-dl to use the new version.') to_screen('Updated youtube-dl. Restart youtube-dl to use the new version.')