-from __future__ import unicode_literals
-
import hashlib
import json
import os
from zipimport import zipimporter
from .compat import compat_realpath
-from .utils import encode_compat_str
-
+from .utils import Popen, encode_compat_str, write_string
from .version import __version__
-''' # Not signed
-def rsa_verify(message, signature, key):
- from hashlib import sha256
- assert isinstance(message, bytes)
- byte_size = (len(bin(key[0])) - 2 + 8 - 1) // 8
- signature = ('%x' % pow(int(signature, 16), key[1], key[0])).encode()
- signature = (byte_size * 2 - len(signature)) * b'0' + signature
- asn1 = b'3031300d060960864801650304020105000420'
- asn1 += sha256(message).hexdigest().encode()
- if byte_size < len(asn1) // 2 + 11:
- return False
- expected = b'0001' + (byte_size - len(asn1) // 2 - 3) * b'ff' + b'00' + asn1
- return expected == signature
-'''
-
-
def detect_variant():
if hasattr(sys, 'frozen'):
+ prefix = 'mac' if sys.platform == 'darwin' else 'win'
if getattr(sys, '_MEIPASS', None):
if sys._MEIPASS == os.path.dirname(sys.executable):
- return 'dir'
- return 'exe'
+ return f'{prefix}_dir'
+ return f'{prefix}_exe'
return 'py2exe'
- elif isinstance(globals().get('__loader__'), zipimporter):
+ elif isinstance(__loader__, zipimporter):
return 'zip'
elif os.path.basename(sys.argv[0]) == '__main__.py':
return 'source'
_NON_UPDATEABLE_REASONS = {
- 'exe': None,
+ 'win_exe': None,
'zip': None,
- 'dir': 'Auto-update is not supported for unpackaged windows executable; Re-download the latest release',
- 'py2exe': 'There is no official release for py2exe executable; Build it again with the latest source code',
+ 'mac_exe': None,
+ 'py2exe': None,
+ 'win_dir': 'Auto-update is not supported for unpackaged windows executable; Re-download the latest release',
+ 'mac_dir': 'Auto-update is not supported for unpackaged MacOS executable; Re-download the latest release',
'source': 'You cannot update when running from source code; Use git to pull the latest changes',
- 'unknown': 'It looks like you installed yt-dlp with a package manager, pip, setup.py or a tarball; Use that to update',
+ 'unknown': 'It looks like you installed yt-dlp with a package manager, pip or setup.py; Use that to update',
}
# Download and check versions info
try:
- version_info = ydl._opener.open(JSON_URL).read().decode('utf-8')
+ version_info = ydl._opener.open(JSON_URL).read().decode()
version_info = json.loads(version_info)
except Exception:
return report_network_error('obtain version info', delim='; Please try again later or')
return tuple(map(int, version_str.split('.')))
version_id = version_info['tag_name']
+ ydl.to_screen(f'Latest version: {version_id}, Current version: {__version__}')
if version_tuple(__version__) >= version_tuple(version_id):
ydl.to_screen(f'yt-dlp is up to date ({__version__})')
return
err = is_non_updateable()
if err:
- ydl.to_screen(f'Latest version: {version_id}, Current version: {__version__}')
return report_error(err, True)
# sys.executable is set to the full pathname of the exe-file for py2exe
# though symlinks are not followed so that we need to do this manually
# with help of realpath
filename = compat_realpath(sys.executable if hasattr(sys, 'frozen') else sys.argv[0])
- ydl.to_screen(f'Current version {__version__}; Build Hash {calc_sha256sum(filename)}')
+ ydl.to_screen(f'Current Build Hash {calc_sha256sum(filename)}')
ydl.to_screen(f'Updating to version {version_id} ...')
version_labels = {
'zip_3': '',
- 'exe_64': '.exe',
- 'exe_32': '_x86.exe',
+ 'win_exe_64': '.exe',
+ 'py2exe_64': '_min.exe',
+ 'win_exe_32': '_x86.exe',
+ 'mac_exe_64': '_macos',
}
def get_bin_info(bin_or_exe, version):
- label = version_labels['%s_%s' % (bin_or_exe, version)]
+ label = version_labels[f'{bin_or_exe}_{version}']
return next((i for i in version_info['assets'] if i['name'] == 'yt-dlp%s' % label), {})
def get_sha256sum(bin_or_exe, version):
- filename = 'yt-dlp%s' % version_labels['%s_%s' % (bin_or_exe, version)]
+ filename = 'yt-dlp%s' % version_labels[f'{bin_or_exe}_{version}']
urlh = next(
(i for i in version_info['assets'] if i['name'] in ('SHA2-256SUMS')),
{}).get('browser_download_url')
if not urlh:
return None
- hash_data = ydl._opener.open(urlh).read().decode('utf-8')
+ hash_data = ydl._opener.open(urlh).read().decode()
return dict(ln.split()[::-1] for ln in hash_data.splitlines()).get(filename)
if not os.access(filename, os.W_OK):
return report_permission_error(filename)
# PyInstaller
- if hasattr(sys, 'frozen'):
- exe = filename
- directory = os.path.dirname(exe)
+ variant = detect_variant()
+ if variant in ('win_exe', 'py2exe'):
+ directory = os.path.dirname(filename)
if not os.access(directory, os.W_OK):
return report_permission_error(directory)
try:
if os.path.exists(filename + '.old'):
os.remove(filename + '.old')
- except (IOError, OSError):
+ except OSError:
return report_unable('remove the old version')
try:
arch = platform.architecture()[0][:2]
- url = get_bin_info('exe', arch).get('browser_download_url')
+ url = get_bin_info(variant, arch).get('browser_download_url')
if not url:
return report_network_error('fetch updates')
urlh = ydl._opener.open(url)
newcontent = urlh.read()
urlh.close()
- except (IOError, OSError):
+ except OSError:
return report_network_error('download latest version')
- if not os.access(exe + '.new', os.W_OK):
- return report_permission_error(f'{exe}.new')
try:
- with open(exe + '.new', 'wb') as outf:
+ with open(filename + '.new', 'wb') as outf:
outf.write(newcontent)
- except (IOError, OSError):
- return report_unable('write the new version')
+ except OSError:
+ return report_permission_error(f'{filename}.new')
- expected_sum = get_sha256sum('exe', arch)
+ expected_sum = get_sha256sum(variant, arch)
if not expected_sum:
ydl.report_warning('no hash information found for the release')
- elif calc_sha256sum(exe + '.new') != expected_sum:
+ elif calc_sha256sum(filename + '.new') != expected_sum:
report_network_error('verify the new executable')
try:
- os.remove(exe + '.new')
+ os.remove(filename + '.new')
except OSError:
return report_unable('remove corrupt download')
try:
- os.rename(exe, exe + '.old')
- except (IOError, OSError):
+ os.rename(filename, filename + '.old')
+ except OSError:
return report_unable('move current version')
try:
- os.rename(exe + '.new', exe)
- except (IOError, OSError):
+ os.rename(filename + '.new', filename)
+ except OSError:
report_unable('overwrite current version')
- os.rename(exe + '.old', exe)
+ os.rename(filename + '.old', filename)
return
try:
# Continues to run in the background
- subprocess.Popen(
- 'ping 127.0.0.1 -n 5 -w 1000 & del /F "%s.old"' % exe,
+ Popen(
+ 'ping 127.0.0.1 -n 5 -w 1000 & del /F "%s.old"' % filename,
shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
ydl.to_screen('Updated yt-dlp to version %s' % version_id)
return True # Exit app
except OSError:
report_unable('delete the old version')
- # Zip unix package
- elif isinstance(globals().get('__loader__'), zipimporter):
+ elif variant in ('zip', 'mac_exe'):
+ pack_type = '3' if variant == 'zip' else '64'
try:
- url = get_bin_info('zip', '3').get('browser_download_url')
+ url = get_bin_info(variant, pack_type).get('browser_download_url')
if not url:
return report_network_error('fetch updates')
urlh = ydl._opener.open(url)
newcontent = urlh.read()
urlh.close()
- except (IOError, OSError):
+ except OSError:
return report_network_error('download the latest version')
- expected_sum = get_sha256sum('zip', '3')
+ expected_sum = get_sha256sum(variant, pack_type)
if not expected_sum:
ydl.report_warning('no hash information found for the release')
elif hashlib.sha256(newcontent).hexdigest() != expected_sum:
- return report_network_error('verify the new zip')
+ return report_network_error('verify the new package')
try:
with open(filename, 'wb') as outf:
outf.write(newcontent)
- except (IOError, OSError):
+ except OSError:
return report_unable('overwrite current version')
- ydl.to_screen('Updated yt-dlp to version %s; Restart yt-dlp to use the new version' % version_id)
-
-
-''' # UNUSED
-def get_notes(versions, fromVersion):
- notes = []
- for v, vdata in sorted(versions.items()):
- if v > fromVersion:
- notes.extend(vdata.get('notes', []))
- return notes
-
+ ydl.to_screen('Updated yt-dlp to version %s; Restart yt-dlp to use the new version' % version_id)
+ return
-def print_notes(to_screen, versions, fromVersion=__version__):
- notes = get_notes(versions, fromVersion)
- if notes:
- to_screen('PLEASE NOTE:')
- for note in notes:
- to_screen(note)
-'''
+ assert False, f'Unhandled variant: {variant}'
+# Deprecated
def update_self(to_screen, verbose, opener):
- ''' Exists for backward compatibility '''
printfn = to_screen
- printfn(
- 'WARNING: "yt_dlp.update.update_self" is deprecated and may be removed in a future version. '
- 'Use "yt_dlp.update.run_update(ydl)" instead')
+ write_string(
+ 'DeprecationWarning: "yt_dlp.update.update_self" is deprecated and may be removed in a future version. '
+ 'Use "yt_dlp.update.run_update(ydl)" instead\n')
class FakeYDL():
_opener = opener
projects / yt-dlp.git / blobdiff