From: Sergey M․ <dstftw@gmail.com>
Date: Mon, 20 Apr 2015 15:13:31 +0000 (+0600)
Subject: [extractor/common] Add ability to specify custom field preference for `_sort_formats`
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=3ded7bac166c71f99b8d8036c072552c483d2364;hp=b524a001d68767298272ef59274c826a6ea6a1b7;p=youtube-dl

[extractor/common] Add ability to specify custom field preference for `_sort_formats`
---

diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index 7757bf950..71230323c 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -708,7 +708,7 @@ class InfoExtractor(object):
         return self._html_search_meta('twitter:player', html,
                                       'twitter card player')
 
-    def _sort_formats(self, formats):
+    def _sort_formats(self, formats, field_preference=None):
         if not formats:
             raise ExtractorError('No video formats found')
 
@@ -718,6 +718,9 @@ class InfoExtractor(object):
             if not f.get('ext') and 'url' in f:
                 f['ext'] = determine_ext(f['url'])
 
+            if isinstance(field_preference, (list, tuple)):
+                return tuple(f.get(field) if f.get(field) is not None else -1 for field in field_preference)
+
             preference = f.get('preference')
             if preference is None:
                 proto = f.get('protocol')