X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fchannel9.py;h=574881b70de67b9521b5e813f0cafa6da59d1068;hb=19dab5e6cc9e0a7a726af8bb67ca30801c2107b0;hp=b4b586c1226da0ca7a978dd67e1c1152ddcc2b6c;hpb=4d2ebb6bd771edaa26ebb5e76f9ee8e880a4d152;p=youtube-dl diff --git a/youtube_dl/extractor/channel9.py b/youtube_dl/extractor/channel9.py index b4b586c12..574881b70 100644 --- a/youtube_dl/extractor/channel9.py +++ b/youtube_dl/extractor/channel9.py @@ -39,7 +39,7 @@ class Channel9IE(InfoExtractor): u'md5': u'b43ee4529d111bc37ba7ee4f34813e68', u'info_dict': { u'title': u'Self-service BI with Power BI - nuclear testing', - u'description': u'md5:a6d5cfd9ee46d1851cf6e40ea61cfc10', + u'description': u'md5:d1e6ecaafa7fb52a2cacdf9599829f5b', u'duration': 1540, u'thumbnail': u'http://media.ch9.ms/ch9/87e1/0300391f-a455-4c72-bec3-4422f19287e1/selfservicenuk_512.jpg', u'authors': [ u'Mike Wilmot' ], @@ -76,14 +76,18 @@ class Channel9IE(InfoExtractor): )? # File size part may be missing ''' # Extract known formats - formats = [{'url': x.group('url'), - 'format_id': x.group('quality'), - 'format_note': x.group('note'), - 'format': '%s (%s)' % (x.group('quality'), x.group('note')), - 'filesize': self._restore_bytes(x.group('filesize')), # File size is approximate - } for x in list(re.finditer(FORMAT_REGEX, html)) if x.group('quality') in self._known_formats] - # Sort according to known formats list - formats.sort(key=lambda fmt: self._known_formats.index(fmt['format_id'])) + formats = [{ + 'url': x.group('url'), + 'format_id': x.group('quality'), + 'format_note': x.group('note'), + 'format': u'%s (%s)' % (x.group('quality'), x.group('note')), + 'filesize': self._restore_bytes(x.group('filesize')), # File size is approximate + 'preference': self._known_formats.index(x.group('quality')), + 'vcodec': 'none' if x.group('note') == 'Audio only' else None, + } for x in list(re.finditer(FORMAT_REGEX, html)) if x.group('quality') in self._known_formats] + + self._sort_formats(formats) + return formats def _extract_title(self, html):