aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-04-07 15:24:12 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-04-07 15:25:35 +0200
commitdfb2cb5cfdf7ec58e64ae2a4fe0d96dce242465c (patch)
treeaa4afeb9741f9729d53e1df26d5ab820e2fcf5e3 /youtube_dl
parent650d688d10d287ac7a55568128b62df6e4b3cfe6 (diff)
[teamcoco] Simplify ID management (Closes #2715)
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/teamcoco.py17
1 files changed, 8 insertions, 9 deletions
diff --git a/youtube_dl/extractor/teamcoco.py b/youtube_dl/extractor/teamcoco.py
index c86f1e423..dcdadd120 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>[0-9]+)?/?(?P<url_title>.*)'
+ _VALID_URL = r'http://teamcoco\.com/video/(?P<video_id>[0-9]+)?/?(?P<display_id>.*)'
_TESTS = [
{
'url': 'http://teamcoco.com/video/80187/conan-becomes-a-mary-kay-beauty-consultant',
@@ -33,21 +33,19 @@ class TeamcocoIE(InfoExtractor):
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
- if mobj is None:
- raise ExtractorError('Invalid URL: %s' % url)
- url_title = mobj.group('url_title')
- webpage = self._download_webpage(url, url_title)
+
+ display_id = mobj.group('display_id')
+ webpage = self._download_webpage(url, display_id)
video_id = mobj.group("video_id")
- if video_id == '':
+ if not 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
- data = self._download_xml(data_url, video_id, 'Downloading data webpage')
+ data = self._download_xml(
+ data_url, display_id, 'Downloading data webpage')
qualities = ['500k', '480p', '1000k', '720p', '1080p']
formats = []
@@ -82,6 +80,7 @@ class TeamcocoIE(InfoExtractor):
return {
'id': video_id,
+ 'display_id': display_id,
'formats': formats,
'title': self._og_search_title(webpage),
'thumbnail': self._og_search_thumbnail(webpage),