From: AGSPhoenix Date: Fri, 4 Apr 2014 17:42:34 +0000 (-0400) Subject: Support TeamCoco URLs with video_id in the title X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=04ee53eca1345df36a8c4a251c22a29f797ab798;p=youtube-dl Support TeamCoco URLs with video_id in the title If the URL has the video_id in it, use that since the current method of finding the id breaks on those pages. Fixes 2698. --- diff --git a/youtube_dl/extractor/teamcoco.py b/youtube_dl/extractor/teamcoco.py index 9dcffead0..e0fc3e60f 100644 --- a/youtube_dl/extractor/teamcoco.py +++ b/youtube_dl/extractor/teamcoco.py @@ -9,7 +9,7 @@ from ..utils import ( class TeamcocoIE(InfoExtractor): - _VALID_URL = r'http://teamcoco\.com/video/(?P.*)' + _VALID_URL = r'http://teamcoco\.com/video/(?P\d*)?/?(?P.*)' _TEST = { 'url': 'http://teamcoco.com/video/louis-ck-interview-george-w-bush', 'file': '19705.mp4', @@ -26,11 +26,13 @@ class TeamcocoIE(InfoExtractor): 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'