MarcoBuster/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-12-25 20:55:52 +01:00
Code Issues Projects Releases Wiki Activity

[extractor/zdf] Improve format sorting (#4040)

Browse Source 
Closes #4020

Authored by: elyse0
This commit is contained in:
Elyse 2022-06-10 17:22:14 -05:00 committed by GitHub
parent 6837633a4a
commit 62b2b736e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
yt_dlp/extractor/zdf.py
View File

@ -69,6 +69,7 @@ def _extract_format(self, video_id, formats, format_urls, meta):
f.update({ f.update({
'url': format_url, 'url': format_url,
'format_id': join_nonempty('http', meta.get('type'), meta.get('quality')), 'format_id': join_nonempty('http', meta.get('type'), meta.get('quality')),
'tbr': int_or_none(self._search_regex(r'_(\d+)k_', format_url, default=None))
}) })
new_formats = [f] new_formats = [f]
formats.extend(merge_dicts(f, { formats.extend(merge_dicts(f, {
@ -108,7 +109,7 @@ def _extract_ptmd(self, ptmd_url, video_id, api_token, referrer):
'class': track.get('class'), 'class': track.get('class'),
'language': track.get('language'), 'language': track.get('language'),
}) })
self._sort_formats(formats, ('hasaud', 'res', 'quality', 'language_preference')) self._sort_formats(formats, ('tbr', 'res', 'quality', 'language_preference'))
duration = float_or_none(try_get( duration = float_or_none(try_get(
ptmd, lambda x: x['attributes']['duration']['value']), scale=1000) ptmd, lambda x: x['attributes']['duration']['value']), scale=1000)
@ -187,7 +188,7 @@ class ZDFIE(ZDFBaseIE):
}, },
}, { }, {
'url': 'https://www.zdf.de/funk/druck-11790/funk-alles-ist-verzaubert-102.html', 'url': 'https://www.zdf.de/funk/druck-11790/funk-alles-ist-verzaubert-102.html',
'md5': '3d6f1049e9682178a11c54b91f3dd065', 'md5': '57af4423db0455a3975d2dc4578536bc',
'info_dict': { 'info_dict': {
'ext': 'mp4', 'ext': 'mp4',
'id': 'video_funk_1770473', 'id': 'video_funk_1770473',
@ -230,6 +231,19 @@ class ZDFIE(ZDFBaseIE):
'timestamp': 1641355200, 'timestamp': 1641355200,
'upload_date': '20220105', 'upload_date': '20220105',
}, },
'skip': 'No longer available "Diese Seite wurde leider nicht gefunden"'
}, {
'url': 'https://www.zdf.de/serien/soko-stuttgart/das-geld-anderer-leute-100.html',
'info_dict': {
'id': '191205_1800_sendung_sok8',
'ext': 'mp4',
'title': 'Das Geld anderer Leute',
'description': 'md5:cb6f660850dc5eb7d1ab776ea094959d',
'duration': 2581.0,
'timestamp': 1654790700,
'upload_date': '20220609',
'thumbnail': 'https://epg-image.zdf.de/fotobase-webdelivery/images/e2d7e55a-09f0-424e-ac73-6cac4dd65f35?layout=2400x1350',
},
}] }]
def _extract_entry(self, url, player, content, video_id): def _extract_entry(self, url, player, content, video_id):