projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
6d0d573
)
Revert "Workaround for regex engine limitation"
author
AGSPhoenix
<lx45803@gmail.com>
Fri, 4 Apr 2014 19:37:49 +0000
(15:37 -0400)
committer
AGSPhoenix
<lx45803@gmail.com>
Fri, 4 Apr 2014 19:37:49 +0000
(15:37 -0400)
This reverts commit
6d0d573ecaf763ce2b043ef7f83a743170eab16d
.
youtube_dl/extractor/teamcoco.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/teamcoco.py
b/youtube_dl/extractor/teamcoco.py
index 66c9bd761ec2c536bb6ae2cacf8d2f4d6768b399..fdaf62cd0fe943ba962af0b02332a4ff9c63d4e2 100644
(file)
--- a/
youtube_dl/extractor/teamcoco.py
+++ b/
youtube_dl/extractor/teamcoco.py
@@
-9,7
+9,7
@@
from ..utils import (
class TeamcocoIE(InfoExtractor):
class TeamcocoIE(InfoExtractor):
- _VALID_URL = r'http://teamcoco\.com/video/(
[^/]*)?/?(
.*)'
+ _VALID_URL = r'http://teamcoco\.com/video/(
?P<video_id>\d*)?/?(?P<url_title>
.*)'
_TESTS = [
{
'url': 'http://teamcoco.com/video/80187/conan-becomes-a-mary-kay-beauty-consultant',
_TESTS = [
{
'url': 'http://teamcoco.com/video/80187/conan-becomes-a-mary-kay-beauty-consultant',
@@
-35,13
+35,11
@@
class TeamcocoIE(InfoExtractor):
mobj = re.match(self._VALID_URL, url)
if mobj is None:
raise ExtractorError('Invalid URL: %s' % url)
mobj = re.match(self._VALID_URL, url)
if mobj is None:
raise ExtractorError('Invalid URL: %s' % url)
- url_title = mobj.group(2)
- if url_title == '':
- url_title = mobj.group(1)
+ url_title = mobj.group('url_title')
webpage = self._download_webpage(url, url_title)
webpage = self._download_webpage(url, url_title)
- video_id = mobj.group(
1
)
- if
mobj.group(2)
== '':
+ 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')
video_id = self._html_search_regex(
r'<article class="video" data-id="(\d+?)"',
webpage, 'video id')