Popen,
cached_method,
deprecation_warning,
+ network_exceptions,
remove_end,
remove_start,
sanitized_Request,
'stable': 'yt-dlp/yt-dlp',
'nightly': 'yt-dlp/yt-dlp-nightly-builds',
}
+REPOSITORY = UPDATE_SOURCES['stable']
_VERSION_RE = re.compile(r'(\d+\.)*\d+')
API_BASE_URL = 'https://api.github.com/repos'
# Backwards compatibility variables for the current channel
-REPOSITORY = UPDATE_SOURCES[CHANNEL]
API_URL = f'{API_BASE_URL}/{REPOSITORY}/releases'
self.ydl = ydl
self.target_channel, sep, self.target_tag = (target or CHANNEL).rpartition('@')
- if not sep and self.target_tag in UPDATE_SOURCES: # stable => stable@latest
- self.target_channel, self.target_tag = self.target_tag, None
+ # stable => stable@latest
+ if not sep and ('/' in self.target_tag or self.target_tag in UPDATE_SOURCES):
+ self.target_channel = self.target_tag
+ self.target_tag = None
elif not self.target_channel:
- self.target_channel = CHANNEL
+ self.target_channel = CHANNEL.partition('@')[0]
if not self.target_tag:
- self.target_tag, self._exact = 'latest', False
+ self.target_tag = 'latest'
+ self._exact = False
elif self.target_tag != 'latest':
self.target_tag = f'tags/{self.target_tag}'
- @property
- def _target_repo(self):
- try:
- return UPDATE_SOURCES[self.target_channel]
- except KeyError:
- return self._report_error(
- f'Invalid update channel {self.target_channel!r} requested. '
- f'Valid channels are {", ".join(UPDATE_SOURCES)}', True)
+ if '/' in self.target_channel:
+ self._target_repo = self.target_channel
+ if self.target_channel not in (CHANNEL, *UPDATE_SOURCES.values()):
+ self.ydl.report_warning(
+ f'You are switching to an {self.ydl._format_err("unofficial", "red")} executable '
+ f'from {self.ydl._format_err(self._target_repo, self.ydl.Styles.EMPHASIS)}. '
+ f'Run {self.ydl._format_err("at your own risk", "light red")}')
+ self._block_restart('Automatically restarting into custom builds is disabled for security reasons')
+ else:
+ self._target_repo = UPDATE_SOURCES.get(self.target_channel)
+ if not self._target_repo:
+ self._report_error(
+ f'Invalid update channel {self.target_channel!r} requested. '
+ f'Valid channels are {", ".join(UPDATE_SOURCES)}', True)
def _version_compare(self, a, b, channel=CHANNEL):
- if channel != self.target_channel:
+ if self._exact and channel != self.target_channel:
return False
if _VERSION_RE.fullmatch(f'{a}.{b}'):
self.ydl.to_screen((
f'Available version: {self._label(self.target_channel, self.latest_version)}, ' if self.target_tag == 'latest' else ''
) + f'Current version: {self._label(CHANNEL, self.current_version)}')
- except Exception:
- return self._report_network_error('obtain version info', delim='; Please try again later or')
+ except network_exceptions as e:
+ return self._report_network_error(f'obtain version info ({e})', delim='; Please try again later or')
if not is_non_updateable():
self.ydl.to_screen(f'Current Build Hash: {_sha256_file(self.filename)}')
if (_VERSION_RE.fullmatch(self.target_tag[5:])
and version_tuple(self.target_tag[5:]) < (2023, 3, 2)):
self.ydl.report_warning('You are downgrading to a version without --update-to')
+ self._block_restart('Cannot automatically restart to a version without --update-to')
directory = os.path.dirname(self.filename)
if not os.access(self.filename, os.W_OK):
try:
newcontent = self._download(self.release_name, self._tag)
- except Exception as e:
+ except network_exceptions as e:
if isinstance(e, urllib.error.HTTPError) and e.code == 404:
return self._report_error(
f'The requested tag {self._label(self.target_channel, self.target_tag)} does not exist', True)
_, _, returncode = Popen.run(self.cmd)
return returncode
+ def _block_restart(self, msg):
+ def wrapper():
+ self._report_error(f'{msg}. Restart yt-dlp to use the updated version', expected=True)
+ return self.ydl._download_retcode
+ self.restart = wrapper
+
def run_update(ydl):
"""Update the program file with the latest version from the repository