diff options
| author | trasssh <94064652+trassshhub@users.noreply.github.com> | 2022-01-14 00:51:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-13 22:21:00 +0530 |
| commit | 11c861702d0aaec8197d7e0aa35b4920a3dd2e87 (patch) | |
| tree | bacec0fb5787cc24469b7ecd0e42ae9bd8f566f6 | |
| parent | a4a426023db843392e4a702bcc6706651a8b97d0 (diff) | |
| download | hypervideo-pre-11c861702d0aaec8197d7e0aa35b4920a3dd2e87.tar.lz hypervideo-pre-11c861702d0aaec8197d7e0aa35b4920a3dd2e87.tar.xz hypervideo-pre-11c861702d0aaec8197d7e0aa35b4920a3dd2e87.zip | |
[generic] Improve KVS player extraction (#2328)
Closes #2281
Authored by: trassshhub
| -rw-r--r-- | yt_dlp/extractor/generic.py | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/yt_dlp/extractor/generic.py b/yt_dlp/extractor/generic.py index c834daddb..def04a8c3 100644 --- a/yt_dlp/extractor/generic.py +++ b/yt_dlp/extractor/generic.py @@ -28,6 +28,7 @@ from ..utils import ( mimetype2ext, orderedSet, parse_duration, + parse_resolution, sanitized_Request, smuggle_url, unescapeHTML, @@ -3774,20 +3775,21 @@ class GenericIE(InfoExtractor): protocol, _, _ = url.partition('/') thumbnail = protocol + thumbnail + url_keys = list(filter(re.compile(r'video_url|video_alt_url\d+').fullmatch, flashvars.keys())) formats = [] - for key in ('video_url', 'video_alt_url', 'video_alt_url2'): - if key in flashvars and '/get_file/' in flashvars[key]: - next_format = { - 'url': self._kvs_getrealurl(flashvars[key], flashvars['license_code']), - 'format_id': flashvars.get(key + '_text', key), - 'ext': 'mp4', - } - height = re.search(r'%s_(\d+)p\.mp4(?:/[?].*)?$' % flashvars['video_id'], flashvars[key]) - if height: - next_format['height'] = int(height.group(1)) - else: - next_format['quality'] = 1 - formats.append(next_format) + for key in url_keys: + if '/get_file/' not in flashvars[key]: + continue + format_id = flashvars.get(f'{key}_text', key) + formats.append({ + 'url': self._kvs_getrealurl(flashvars[key], flashvars['license_code']), + 'format_id': format_id, + 'ext': 'mp4', + **(parse_resolution(format_id) or parse_resolution(flashvars[key])) + }) + if not formats[-1].get('height'): + formats[-1]['quality'] = 1 + self._sort_formats(formats) return { |