diff options
| author | AGSPhoenix <lx45803@gmail.com> | 2014-04-04 15:25:28 -0400 |
|---|---|---|
| committer | AGSPhoenix <lx45803@gmail.com> | 2014-04-04 15:25:28 -0400 |
| commit | 6d0d573ecaf763ce2b043ef7f83a743170eab16d (patch) | |
| tree | 755db583bd7aa45ff19fc1f46f855eb3cc85f595 | |
| parent | bb799e811b3f824f6a468336ec21f518bd55eba7 (diff) | |
| download | youtube-dl-6d0d573ecaf763ce2b043ef7f83a743170eab16d.tar.xz | |
Workaround for regex engine limitation
| -rw-r--r-- | youtube_dl/extractor/teamcoco.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/youtube_dl/extractor/teamcoco.py b/youtube_dl/extractor/teamcoco.py index fdaf62cd0..66c9bd761 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<video_id>\d*)?/?(?P<url_title>.*)' + _VALID_URL = r'http://teamcoco\.com/video/([^/]*)?/?(.*)' _TESTS = [ { 'url': 'http://teamcoco.com/video/80187/conan-becomes-a-mary-kay-beauty-consultant', @@ -35,11 +35,13 @@ class TeamcocoIE(InfoExtractor): mobj = re.match(self._VALID_URL, url) if mobj is None: raise ExtractorError('Invalid URL: %s' % url) - url_title = mobj.group('url_title') + url_title = mobj.group(2) + if url_title == '': + url_title = mobj.group(1) webpage = self._download_webpage(url, url_title) - video_id = mobj.group("video_id") - if video_id == '': + video_id = mobj.group(1) + if mobj.group(2) == '': video_id = self._html_search_regex( r'<article class="video" data-id="(\d+?)"', webpage, 'video id') |