From a34f1a55ce820c4e804616818afb56c9ab9cd1e4 Mon Sep 17 00:00:00 2001 From: Joshua Walden Date: Tue, 31 Mar 2020 20:11:55 -0500 Subject: [PATCH] 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. --- youtube_dl/__init__.py | 4 ++- youtube_dl/update.py | 72 +++++++++++++++++++++--------------------- 2 files changed, 39 insertions(+), 37 deletions(-) diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 9a659fc65..98254cac3 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -441,7 +441,9 @@ def _real_main(argv=None): with YoutubeDL(ydl_opts) as ydl: # Update version 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 if opts.rm_cachedir: diff --git a/youtube_dl/update.py b/youtube_dl/update.py index 84c964617..b8e2c7360 100644 --- a/youtube_dl/update.py +++ b/youtube_dl/update.py @@ -29,7 +29,7 @@ def rsa_verify(message, signature, key): 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_URL = 'https://yt-dl.org/update/' @@ -38,17 +38,17 @@ def update_self(to_screen, verbose, opener): UPDATES_RSA_KEY = (0x9d60ee4d8f805312fdb15a62f87b95bd66177b91df176765d13514a0f1754bcd2057295c5b6f1d35daa6742c3ffc9a82d3e118861c207995a8031e151d863c9927e304576bc80692bc8e094896fcf11b66f3e29e04e3a71e9a11558558acea1840aec37fc396fb6b65dc81a1c4144e03bd1c011de62e3f1357b327d08426fe93, 65537) 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.') - return + 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 1 # Check if there is a new version try: newversion = opener.open(VERSION_URL).read().decode('utf-8').strip() except Exception: if verbose: - to_screen(encode_compat_str(traceback.format_exc())) - to_screen('ERROR: can\'t find the current version. Please try again later.') - return + to_stderr(encode_compat_str(traceback.format_exc())) + to_stderr('ERROR: can\'t find the current version. Please try again later.') + return 1 if newversion == __version__: to_screen('youtube-dl is up-to-date (' + __version__ + ')') return @@ -59,17 +59,17 @@ def update_self(to_screen, verbose, opener): versions_info = json.loads(versions_info) except Exception: if verbose: - to_screen(encode_compat_str(traceback.format_exc())) - to_screen('ERROR: can\'t obtain versions info. Please try again later.') - return + to_stderr(encode_compat_str(traceback.format_exc())) + to_stderr('ERROR: can\'t obtain versions info. Please try again later.') + return 1 if 'signature' not in versions_info: - to_screen('ERROR: the versions file is not signed or corrupted. Aborting.') - return + to_stderr('ERROR: the versions file is not signed or corrupted. Aborting.') + return 1 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('ERROR: the versions file signature is invalid. Aborting.') - return + to_stderr('ERROR: the versions file signature is invalid. Aborting.') + return 1 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]) if not os.access(filename, os.W_OK): - to_screen('ERROR: no write permissions on %s' % filename) - return + to_stderr('ERROR: no write permissions on %s' % filename) + return 1 # Py2EXE if hasattr(sys, 'frozen'): exe = filename directory = os.path.dirname(exe) if not os.access(directory, os.W_OK): - to_screen('ERROR: no write permissions on %s' % directory) - return + to_stderr('ERROR: no write permissions on %s' % directory) + return 1 try: urlh = opener.open(version['exe'][0]) @@ -107,23 +107,23 @@ def update_self(to_screen, verbose, opener): urlh.close() except (IOError, OSError): if verbose: - to_screen(encode_compat_str(traceback.format_exc())) - to_screen('ERROR: unable to download latest version') - return + to_stderr(encode_compat_str(traceback.format_exc())) + to_stderr('ERROR: unable to download latest version') + return 1 newcontent_hash = hashlib.sha256(newcontent).hexdigest() if newcontent_hash != version['exe'][1]: - to_screen('ERROR: the downloaded file hash does not match. Aborting.') - return + to_stderr('ERROR: the downloaded file hash does not match. Aborting.') + return 1 try: with open(exe + '.new', 'wb') as outf: outf.write(newcontent) except (IOError, OSError): if verbose: - to_screen(encode_compat_str(traceback.format_exc())) - to_screen('ERROR: unable to write the new version') - return + to_stderr(encode_compat_str(traceback.format_exc())) + to_stderr('ERROR: unable to write the new version') + return 1 try: 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 except (IOError, OSError): if verbose: - to_screen(encode_compat_str(traceback.format_exc())) - to_screen('ERROR: unable to overwrite current version') - return + to_stderr(encode_compat_str(traceback.format_exc())) + to_stderr('ERROR: unable to overwrite current version') + return 1 # Zip unix package elif isinstance(globals().get('__loader__'), zipimporter): @@ -153,23 +153,23 @@ start /b "" cmd /c del "%%~f0"&exit /b" urlh.close() except (IOError, OSError): if verbose: - to_screen(encode_compat_str(traceback.format_exc())) - to_screen('ERROR: unable to download latest version') - return + to_stderr(encode_compat_str(traceback.format_exc())) + to_stderr('ERROR: unable to download latest version') + return 1 newcontent_hash = hashlib.sha256(newcontent).hexdigest() if newcontent_hash != version['bin'][1]: - to_screen('ERROR: the downloaded file hash does not match. Aborting.') - return + to_stderr('ERROR: the downloaded file hash does not match. Aborting.') + return 1 try: with open(filename, 'wb') as outf: outf.write(newcontent) except (IOError, OSError): if verbose: - to_screen(encode_compat_str(traceback.format_exc())) - to_screen('ERROR: unable to overwrite current version') - return + to_stderr(encode_compat_str(traceback.format_exc())) + to_stderr('ERROR: unable to overwrite current version') + return 1 to_screen('Updated youtube-dl. Restart youtube-dl to use the new version.')