diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py index ea14893ac..bdbff6742 100644 --- a/yt_dlp/YoutubeDL.py +++ b/yt_dlp/YoutubeDL.py @@ -1643,7 +1643,7 @@ def wrapper(self, *args, **kwargs): except ReExtractInfoLater as e: if wait_retries > max_retries: if max_retries > 0: - self.report_error(f'[wait] Giving up after {wait_retries-1} {"retries" if wait_retries != 2 else "retry"} while waiting.') + self.report_error(f'[wait] Giving up after {wait_retries - 1} {"retries" if wait_retries != 2 else "retry"} while waiting.') else: self.report_error('[wait] Video is still unavailable after waiting.') return @@ -1678,6 +1678,7 @@ def wrapper(self, *args, **kwargs): def _wait_until(self, till): format_dur = lambda dur: '%02d:%02d:%02d' % timetuple_from_msec(dur * 1000)[:-1] last_msg = '' + def progress(msg): nonlocal last_msg full_msg = f'{msg}\n' diff --git a/yt_dlp/__init__.py b/yt_dlp/__init__.py index bbe95473c..bb761a9ae 100644 --- a/yt_dlp/__init__.py +++ b/yt_dlp/__init__.py @@ -238,7 +238,7 @@ def parse_retries(name, value): return int_value def parse_range_with_arg(name, arg_name, value, - parse_limits=parse_duration, parse_arg=parse_retries): + parse_limits=parse_duration, parse_arg=parse_retries): # syntax: MIN[-MAX][:N] m = re.fullmatch(r'([^-:]+)(-[^:]+)?(:.+)?', value) validate(m, name, value) @@ -254,7 +254,7 @@ def parse_range_with_arg(name, arg_name, value, if opts.wait_for_video is not None: min_wait, max_wait, wait_retries = parse_range_with_arg( - 'time range to wait for video', 'waiting', opts.wait_for_video) + 'time range to wait for video', 'waiting', opts.wait_for_video) opts.wait_for_video = (min_wait, max_wait, wait_retries) # Format sort