diff options
| author | Jesús <heckyel@hyperbola.info> | 2021-11-27 13:25:01 -0500 |
|---|---|---|
| committer | Jesús <heckyel@hyperbola.info> | 2021-11-27 13:25:01 -0500 |
| commit | c6df1db4745c9d399204876bbe04e8a311c01df1 (patch) | |
| tree | a9f4ffa1db45e367aba1de858ac536b761f192fb /yt_dlp/extractor/zdf.py | |
| parent | 5bb25093eb718346ab8a723d2c04f0066fc3958a (diff) | |
| parent | 93e597ba287539643851f0ad5c5ff04760380268 (diff) | |
| download | hypervideo-pre-c6df1db4745c9d399204876bbe04e8a311c01df1.tar.lz hypervideo-pre-c6df1db4745c9d399204876bbe04e8a311c01df1.tar.xz hypervideo-pre-c6df1db4745c9d399204876bbe04e8a311c01df1.zip | |
updated from upstream | 27/11/2021 at 13:25
Diffstat (limited to 'yt_dlp/extractor/zdf.py')
| -rw-r--r-- | yt_dlp/extractor/zdf.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/yt_dlp/extractor/zdf.py b/yt_dlp/extractor/zdf.py index 8c279c5ab..df236c050 100644 --- a/yt_dlp/extractor/zdf.py +++ b/yt_dlp/extractor/zdf.py @@ -9,12 +9,12 @@ from ..utils import ( determine_ext, float_or_none, int_or_none, + join_nonempty, merge_dicts, NO_DEFAULT, orderedSet, parse_codecs, qualities, - str_or_none, try_get, unified_timestamp, update_url_query, @@ -70,11 +70,11 @@ class ZDFBaseIE(InfoExtractor): f = {'vcodec': data[0], 'acodec': data[1]} f.update({ 'url': format_url, - 'format_id': '-'.join(filter(str_or_none, ('http', meta.get('type'), meta.get('quality')))), + 'format_id': join_nonempty('http', meta.get('type'), meta.get('quality')), }) new_formats = [f] formats.extend(merge_dicts(f, { - 'format_note': ', '.join(filter(None, (meta.get('quality'), meta.get('class')))), + 'format_note': join_nonempty('quality', 'class', from_dict=meta, delim=', '), 'language': meta.get('language'), 'language_preference': 10 if meta.get('class') == 'main' else -10 if meta.get('class') == 'ad' else -1, 'quality': qualities(self._QUALITIES)(meta.get('quality')), |