diff options
| author | AGSPhoenix <lx45803@gmail.com> | 2014-04-04 13:42:34 -0400 |
|---|---|---|
| committer | AGSPhoenix <lx45803@gmail.com> | 2014-04-04 13:42:34 -0400 |
| commit | 04ee53eca1345df36a8c4a251c22a29f797ab798 (patch) | |
| tree | 7ce11d8ac7f91e7caf3c11692e422120a8095ce0 /youtube_dl | |
| parent | 2c1396073ebf396f5b4b35d6171363f632e60716 (diff) | |
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.
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/extractor/teamcoco.py | 14 |
1 files changed, 8 insertions, 6 deletions
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<url_title>.*)' + _VALID_URL = r'http://teamcoco\.com/video/(?P<video_id>\d*)?/?(?P<url_title>.*)' _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'<article class="video" data-id="(\d+?)"', - webpage, 'video id') - + + video_id = mobj.group("video_id") + if video_id == '': + video_id = self._html_search_regex( + r'<article class="video" data-id="(\d+?)"', + webpage, 'video id') + self.report_extraction(video_id) data_url = 'http://teamcoco.com/cvp/2.0/%s.xml' % video_id |