projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'Dineshs91/KontrTube-fix'
[youtube-dl]
/
youtube_dl
/
extractor
/
teamcoco.py
diff --git
a/youtube_dl/extractor/teamcoco.py
b/youtube_dl/extractor/teamcoco.py
index c86f1e423a054db47906e9920174680bea435c46..fa796ce72126610cda53db5378d926b44d72e526 100644
(file)
--- a/
youtube_dl/extractor/teamcoco.py
+++ b/
youtube_dl/extractor/teamcoco.py
@@
-3,13
+3,10
@@
from __future__ import unicode_literals
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
-from ..utils import (
- ExtractorError,
-)
class TeamcocoIE(InfoExtractor):
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',
_TESTS = [
{
'url': 'http://teamcoco.com/video/80187/conan-becomes-a-mary-kay-beauty-consultant',
@@
-33,21
+30,19
@@
class TeamcocoIE(InfoExtractor):
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
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")
video_id = mobj.group("video_id")
- if
video_id == ''
:
+ if
not video_id
:
video_id = self._html_search_regex(
video_id = self._html_search_regex(
- r'
<article class="video" data
-id="(\d+?)"',
+ r'
data-node
-id="(\d+?)"',
webpage, 'video id')
webpage, 'video id')
-
- self.report_extraction(video_id)
data_url = 'http://teamcoco.com/cvp/2.0/%s.xml' % 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 = []
qualities = ['500k', '480p', '1000k', '720p', '1080p']
formats = []
@@
-82,6
+77,7
@@
class TeamcocoIE(InfoExtractor):
return {
'id': video_id,
return {
'id': video_id,
+ 'display_id': display_id,
'formats': formats,
'title': self._og_search_title(webpage),
'thumbnail': self._og_search_thumbnail(webpage),
'formats': formats,
'title': self._og_search_title(webpage),
'thumbnail': self._og_search_thumbnail(webpage),