From 129555b19ab524b14e7efa433c1001c326bd5b02 Mon Sep 17 00:00:00 2001 From: Elyse <26639800+elyse0@users.noreply.github.com> Date: Fri, 17 Mar 2023 22:39:21 -0600 Subject: [PATCH] Fix return values of _extract_sequence_from_mpd --- yt_dlp/extractor/youtube.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/yt_dlp/extractor/youtube.py b/yt_dlp/extractor/youtube.py index 0b83b70ff..3009dd39b 100644 --- a/yt_dlp/extractor/youtube.py +++ b/yt_dlp/extractor/youtube.py @@ -2790,9 +2790,10 @@ def _extract_sequence_from_mpd(refresh_sequence, immediate): or (mpd_url, stream_number, False)) if not refresh_sequence: if expire_fast and not is_live: - return False, last_seq + return False elif old_mpd_url == mpd_url: - return True, last_seq + return True + if manifestless_orig_fmt: fmt_info = manifestless_orig_fmt else: @@ -2803,7 +2804,7 @@ def _extract_sequence_from_mpd(refresh_sequence, immediate): fmts = None if not fmts: no_fragment_score += 2 - return False, last_seq + return False fmt_info = next(x for x in fmts if x['manifest_stream_number'] == stream_number) fragments = fmt_info['fragments'] fragment_base_url = fmt_info['fragment_base_url'] @@ -2830,13 +2831,13 @@ def _extract_sequence_from_mpd(refresh_sequence, immediate): continue else: should_continue = _extract_sequence_from_mpd(True, no_fragment_score > 15) + last_seq = int(re.search(r'(?:/|^)sq/(\d+)', fragments[-1]['path']).group(1)) + no_fragment_score += 2 if not should_continue: continue last_fragment = fragments[-1] - last_seq = int(re.search(r'(?:/|^)sq/(\d+)', last_fragment['path']).group(1)) - known_fragment = next( (fragment for fragment in fragments if f'sq/{known_idx}' in fragment['path']), None) if known_fragment and known_fragment['end'] > section_end: