commit bf5b0a1bfb3d875cb3ccd2fc834efd7343885bd2 parent bfe9de8510d99da9803075f8bc71059bb3b3d4ed Author: Philipp Hagemeister <phihag@phihag.de> Date: Thu, 26 Dec 2013 18:40:09 +0100 [ivi] Use centralized format sorting Diffstat:
| M | youtube_dl/extractor/ivi.py | | | 18 | ++++++++++-------- |
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/youtube_dl/extractor/ivi.py b/youtube_dl/extractor/ivi.py @@ -84,14 +84,16 @@ class IviIE(InfoExtractor): result = video_json[u'result'] - formats = [{'url': x[u'url'], - 'format_id': x[u'content_format'] - } for x in result[u'files'] if x[u'content_format'] in self._known_formats] - formats.sort(key=lambda fmt: self._known_formats.index(fmt['format_id'])) - - if len(formats) == 0: - self._downloader.report_warning(u'No media links available for %s' % video_id) - return + formats = [{ + 'url': x[u'url'], + 'format_id': x[u'content_format'], + 'preference': self._known_formats.index(x[u'content_format']), + } for x in result[u'files'] if x[u'content_format'] in self._known_formats] + + self._sort_formats(formats) + + if not formats: + raise ExtractorError(u'No media links available for %s' % video_id) duration = result[u'duration'] compilation = result[u'compilation']