From f137c99e9fa6c57d5d44e566ff540e2f92b6923d Mon Sep 17 00:00:00 2001 From: pukkandan Date: Mon, 25 Jan 2021 19:28:39 +0530 Subject: [PATCH] Fix some fields not sorting correctly bug introduced by: 63be1aab2f6b6a99f289663ffd935e311aff5556 --- youtube_dlc/extractor/common.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/youtube_dlc/extractor/common.py b/youtube_dlc/extractor/common.py index d14517b54..7b2f158e1 100644 --- a/youtube_dlc/extractor/common.py +++ b/youtube_dlc/extractor/common.py @@ -1375,7 +1375,7 @@ class InfoExtractor(object): 'order': ['vp9', '(h265|he?vc?)', '(h264|avc)', 'vp8', '(mp4v|h263)', 'theora', '', None, 'none']}, 'acodec': {'type': 'ordered', 'regex': True, 'order': ['opus', 'vorbis', 'aac', 'mp?4a?', 'mp3', 'e?a?c-?3', 'dts', '', None, 'none']}, - 'proto': {'type': 'ordered', 'regex': True, + 'proto': {'type': 'ordered', 'regex': True, 'field': 'protocol', 'order': ['(ht|f)tps', '(ht|f)tp$', 'm3u8.+', 'm3u8', '.*dash', '', 'mms|rtsp', 'none', 'f4']}, 'vext': {'type': 'ordered', 'field': 'video_ext', 'order': ('mp4', 'webm', 'flv', '', 'none'), @@ -1384,14 +1384,14 @@ class InfoExtractor(object): 'order': ('m4a', 'aac', 'mp3', 'ogg', 'opus', 'webm', '', 'none'), 'order_free': ('opus', 'ogg', 'webm', 'm4a', 'mp3', 'aac', '', 'none')}, 'hidden': {'visible': False, 'forced': True, 'type': 'extractor', 'max': -1000}, - 'ie_pref': {'priority': True, 'type': 'extractor'}, + 'ie_pref': {'priority': True, 'type': 'extractor', 'field': 'extractor_preference'}, 'hasvid': {'priority': True, 'field': 'vcodec', 'type': 'boolean', 'not_in_list': ('none',)}, 'hasaud': {'field': 'acodec', 'type': 'boolean', 'not_in_list': ('none',)}, - 'lang': {'priority': True, 'convert': 'ignore'}, + 'lang': {'priority': True, 'convert': 'ignore', 'field': 'language_preference'}, 'quality': {'priority': True, 'convert': 'float_none'}, 'filesize': {'convert': 'bytes'}, - 'fs_approx': {'convert': 'bytes'}, - 'id': {'convert': 'string'}, + 'fs_approx': {'convert': 'bytes', 'field': 'filesize_approx'}, + 'id': {'convert': 'string', 'field': 'format_id'}, 'height': {'convert': 'float_none'}, 'width': {'convert': 'float_none'}, 'fps': {'convert': 'float_none'}, @@ -1399,7 +1399,7 @@ class InfoExtractor(object): 'vbr': {'convert': 'float_none'}, 'abr': {'convert': 'float_none'}, 'asr': {'convert': 'float_none'}, - 'source': {'convert': 'ignore'}, + 'source': {'convert': 'ignore', 'field': 'source_preference'}, 'codec': {'type': 'combined', 'field': ('vcodec', 'acodec')}, 'br': {'type': 'combined', 'field': ('tbr', 'vbr', 'abr'), 'same_limit': True},