X-Git-Url: https://git.rapsys.eu/youtubedl/blobdiff_plain/33cd347759d6d999325ebf3c69b7ed5692c343b2..2dea89ef213e17521789c37e1889c15a40789270:/youtube_dl/extractor/teamcoco.py diff --git a/youtube_dl/extractor/teamcoco.py b/youtube_dl/extractor/teamcoco.py index c910110..9dcffea 100644 --- a/youtube_dl/extractor/teamcoco.py +++ b/youtube_dl/extractor/teamcoco.py @@ -1,3 +1,5 @@ +from __future__ import unicode_literals + import re from .common import InfoExtractor @@ -9,38 +11,66 @@ from ..utils import ( class TeamcocoIE(InfoExtractor): _VALID_URL = r'http://teamcoco\.com/video/(?P.*)' _TEST = { - u'url': u'http://teamcoco.com/video/louis-ck-interview-george-w-bush', - u'file': u'19705.mp4', - u'md5': u'27b6f7527da5acf534b15f21b032656e', - u'info_dict': { - u"description": u"Louis C.K. got starstruck by George W. Bush, so what? Part one.", - u"title": u"Louis C.K. Interview Pt. 1 11/3/11" + 'url': 'http://teamcoco.com/video/louis-ck-interview-george-w-bush', + 'file': '19705.mp4', + 'md5': 'cde9ba0fa3506f5f017ce11ead928f9a', + 'info_dict': { + "description": "Louis C.K. got starstruck by George W. Bush, so what? Part one.", + "title": "Louis C.K. Interview Pt. 1 11/3/11" } } def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) if mobj is None: - raise ExtractorError(u'Invalid URL: %s' % url) + raise ExtractorError('Invalid URL: %s' % url) url_title = mobj.group('url_title') webpage = self._download_webpage(url, url_title) - video_id = self._html_search_regex(r'
]*type="high".*?>(.*?)', - data, u'video URL') + try: + quality = qualities.index(format_id) + except ValueError: + quality = -1 + formats.append({ + 'url': file_url, + 'ext': 'mp4', + 'tbr': tbr, + 'format_id': format_id, + 'quality': quality, + }) - return [{ - 'id': video_id, - 'url': video_url, - 'ext': 'mp4', - 'title': self._og_search_title(webpage), - 'thumbnail': self._og_search_thumbnail(webpage), + self._sort_formats(formats) + + return { + 'id': video_id, + 'formats': formats, + 'title': self._og_search_title(webpage), + 'thumbnail': self._og_search_thumbnail(webpage), 'description': self._og_search_description(webpage), - }] + }