ansol/youtube-dl
7
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-21 04:24:27 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Respect --prefer-insecure while updating (closes #15497)"

Browse Source 
This reverts commit 7d2b4aa047.
This commit is contained in:
Sergey M․ 2018-02-27 22:30:08 +07:00
parent 266fbd6b73
commit 0c3e5f4921
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/__init__.py
View File

@ -438,7 +438,7 @@ 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, opts.prefer_insecure) update_self(ydl.to_screen, opts.verbose, ydl._opener)
# Remove cache dir # Remove cache dir
if opts.rm_cachedir: if opts.rm_cachedir:

2
youtube_dl/options.py
View File

@ -534,7 +534,7 @@ def parseOpts(overrideArguments=None):
workarounds.add_option( workarounds.add_option(
'--prefer-insecure', '--prefer-insecure',
'--prefer-unsecure', action='store_true', dest='prefer_insecure', '--prefer-unsecure', action='store_true', dest='prefer_insecure',
help='Use an unencrypted connection to retrieve information whenever possible') help='Use an unencrypted connection to retrieve information about the video. (Currently supported only for YouTube)')
workarounds.add_option( workarounds.add_option(
'--user-agent', '--user-agent',
metavar='UA', dest='user_agent', metavar='UA', dest='user_agent',

13
youtube_dl/update.py
View File

@ -28,10 +28,10 @@ def rsa_verify(message, signature, key):
return expected == signature return expected == signature
def update_self(to_screen, verbose, opener, prefer_insecure=False): def update_self(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 = '//rg3.github.io/youtube-dl/update/' UPDATE_URL = 'https://rg3.github.io/youtube-dl/update/'
VERSION_URL = UPDATE_URL + 'LATEST_VERSION' VERSION_URL = UPDATE_URL + 'LATEST_VERSION'
JSON_URL = UPDATE_URL + 'versions.json' JSON_URL = UPDATE_URL + 'versions.json'
UPDATES_RSA_KEY = (0x9d60ee4d8f805312fdb15a62f87b95bd66177b91df176765d13514a0f1754bcd2057295c5b6f1d35daa6742c3ffc9a82d3e118861c207995a8031e151d863c9927e304576bc80692bc8e094896fcf11b66f3e29e04e3a71e9a11558558acea1840aec37fc396fb6b65dc81a1c4144e03bd1c011de62e3f1357b327d08426fe93, 65537) UPDATES_RSA_KEY = (0x9d60ee4d8f805312fdb15a62f87b95bd66177b91df176765d13514a0f1754bcd2057295c5b6f1d35daa6742c3ffc9a82d3e118861c207995a8031e151d863c9927e304576bc80692bc8e094896fcf11b66f3e29e04e3a71e9a11558558acea1840aec37fc396fb6b65dc81a1c4144e03bd1c011de62e3f1357b327d08426fe93, 65537)
@ -40,13 +40,9 @@ def update_self(to_screen, verbose, opener, prefer_insecure=False):
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_screen('It looks like you installed youtube-dl with a package manager, pip, setup.py or a tarball. Please use that to update.')
return return
def guess_scheme(url, insecure=False):
return 'http%s:%s' % ('' if insecure is True else 's', url)
# Check if there is a new version # Check if there is a new version
try: try:
newversion = opener.open(guess_scheme( newversion = opener.open(VERSION_URL).read().decode('utf-8').strip()
VERSION_URL, prefer_insecure)).read().decode('utf-8').strip()
except Exception: except Exception:
if verbose: if verbose:
to_screen(encode_compat_str(traceback.format_exc())) to_screen(encode_compat_str(traceback.format_exc()))
@ -58,8 +54,7 @@ def update_self(to_screen, verbose, opener, prefer_insecure=False):
# Download and check versions info # Download and check versions info
try: try:
versions_info = opener.open(guess_scheme( versions_info = opener.open(JSON_URL).read().decode('utf-8')
JSON_URL, prefer_insecure)).read().decode('utf-8')
versions_info = json.loads(versions_info) versions_info = json.loads(versions_info)
except Exception: except Exception:
if verbose: if verbose: