diff options
| author | coletdjnz <colethedj@protonmail.com> | 2021-09-17 20:55:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-18 02:25:49 +0530 |
| commit | 298bf1d275f33ce30b3ebe83f73ba189f6526174 (patch) | |
| tree | 792477d5ffe32c5ce05c99edca7a79893f7cd2c1 | |
| parent | d1b39ad8440aa51ea8dd9ae698786149e72f813d (diff) | |
| download | hypervideo-pre-298bf1d275f33ce30b3ebe83f73ba189f6526174.tar.lz hypervideo-pre-298bf1d275f33ce30b3ebe83f73ba189f6526174.tar.xz hypervideo-pre-298bf1d275f33ce30b3ebe83f73ba189f6526174.zip | |
[itv] Prefer last matching featureset (#1001)
Bug fix for #986
Authored by: coletdjnz
| -rw-r--r-- | yt_dlp/extractor/itv.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/yt_dlp/extractor/itv.py b/yt_dlp/extractor/itv.py index 3418689d6..d69782b78 100644 --- a/yt_dlp/extractor/itv.py +++ b/yt_dlp/extractor/itv.py @@ -113,12 +113,15 @@ class ITVIE(InfoExtractor): def _get_subtitles(self, video_id, variants, ios_playlist_url, headers, *args, **kwargs): subtitles = {} + # Prefer last matching featureset + # See: https://github.com/yt-dlp/yt-dlp/issues/986 platform_tag_subs, featureset_subs = next( ((platform_tag, featureset) - for platform_tag, featuresets in variants.items() for featureset in featuresets + for platform_tag, featuresets in reversed(variants.items()) for featureset in featuresets if try_get(featureset, lambda x: x[2]) == 'outband-webvtt'), (None, None)) - if platform_tag_subs or featureset_subs: + + if platform_tag_subs and featureset_subs: subs_playlist = self._call_api( video_id, ios_playlist_url, headers, platform_tag_subs, featureset_subs, fatal=False) subs = try_get(subs_playlist, lambda x: x['Playlist']['Video']['Subtitles'], list) or [] @@ -139,9 +142,11 @@ class ITVIE(InfoExtractor): variants = self._parse_json( try_get(params, lambda x: x['data-video-variants'], compat_str) or '{}', video_id, fatal=False) + # Prefer last matching featureset + # See: https://github.com/yt-dlp/yt-dlp/issues/986 platform_tag_video, featureset_video = next( ((platform_tag, featureset) - for platform_tag, featuresets in variants.items() for featureset in featuresets + for platform_tag, featuresets in reversed(variants.items()) for featureset in featuresets if try_get(featureset, lambda x: x[:2]) == ['hls', 'aes']), (None, None)) if not platform_tag_video or not featureset_video: |