X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fcomedycentral.py;h=ea1675cf6f82a50d33d9b3996254ccf9ab737613;hb=e55213ce3583aa348b288d51f99f1f46510c3fd4;hp=f0ad5c9a33c20049adacec790b4d72b4496a78ab;hpb=a4a028323e7a09c1d716de20c951f37b5b7c44f7;p=youtube-dl
diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dl/extractor/comedycentral.py
index f0ad5c9a3..ea1675cf6 100644
--- a/youtube_dl/extractor/comedycentral.py
+++ b/youtube_dl/extractor/comedycentral.py
@@ -7,14 +7,14 @@ from .mtv import MTVServicesInfoExtractor
from ..utils import (
compat_str,
compat_urllib_parse,
-
ExtractorError,
+ int_or_none,
unified_strdate,
)
class ComedyCentralIE(MTVServicesInfoExtractor):
- _VALID_URL = r'''(?x)https?://(?:www.)?comedycentral.com/
+ _VALID_URL = r'''(?x)https?://(?:www\.)?(comedycentral|cc)\.com/
(video-clips|episodes|cc-studios|video-collections)
/(?P
.*)'''
_FEED_URL = 'http://comedycentral.com/feeds/mrss/'
@@ -30,41 +30,34 @@ class ComedyCentralIE(MTVServicesInfoExtractor):
},
}
- def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- title = mobj.group('title')
- webpage = self._download_webpage(url, title)
- mgid = self._search_regex(r'data-mgid="(?Pmgid:.*?)"',
- webpage, 'mgid')
- return self._get_videos_info(mgid)
-
class ComedyCentralShowsIE(InfoExtractor):
- IE_DESC = 'The Daily Show / Colbert Report'
+ IE_DESC = 'The Daily Show / The Colbert Report'
# urls can be abbreviations like :thedailyshow or :colbert
# urls for episodes like:
# or urls for clips like: http://www.thedailyshow.com/watch/mon-december-10-2012/any-given-gun-day
# or: http://www.colbertnation.com/the-colbert-report-videos/421667/november-29-2012/moon-shattering-news
# or: http://www.colbertnation.com/the-colbert-report-collections/422008/festival-of-lights/79524
- _VALID_URL = r"""^(:(?Ptds|thedailyshow|cr|colbert|colbertnation|colbertreport)
- |(https?://)?(www\.)?
- (?Pthedailyshow|colbertnation)\.com/
+ _VALID_URL = r'''(?x)^(:(?Ptds|thedailyshow|cr|colbert|colbertnation|colbertreport)
+ |https?://(:www\.)?
+ (?Pthedailyshow|thecolbertreport)\.(?:cc\.)?com/
(full-episodes/(?P.*)|
(?P
(the-colbert-report-(videos|collections)/(?P[0-9]+)/[^/]*/(?P.*?))
|(watch/(?P[^/]*)/(?P.*)))|
(?P
- extended-interviews/(?P[0-9]+)/playlist_tds_extended_(?P.*?)/.*?)))
- $"""
+ extended-interviews/(?P[0-9a-z]+)/(?:playlist_tds_extended_)?(?P.*?)(/.*?)?)))
+ $'''
_TEST = {
- 'url': 'http://www.thedailyshow.com/watch/thu-december-13-2012/kristen-stewart',
- 'file': '422212.mp4',
+ 'url': 'http://thedailyshow.cc.com/watch/thu-december-13-2012/kristen-stewart',
'md5': '4e2f5cb088a83cd8cdb7756132f9739d',
'info_dict': {
- "upload_date": "20121214",
- "description": "Kristen Stewart",
- "uploader": "thedailyshow",
- "title": "thedailyshow-kristen-stewart part 1"
+ 'id': 'ab9ab3e7-5a98-4dbe-8b21-551dc0523d55',
+ 'ext': 'mp4',
+ 'upload_date': '20121213',
+ 'description': 'Kristen Stewart learns to let loose in "On the Road."',
+ 'uploader': 'thedailyshow',
+ 'title': 'thedailyshow-kristen-stewart part 1',
}
}
@@ -87,14 +80,9 @@ class ComedyCentralShowsIE(InfoExtractor):
'400': (384, 216),
}
- @classmethod
- def suitable(cls, url):
- """Receives a URL and returns True if suitable for this IE."""
- return re.match(cls._VALID_URL, url, re.VERBOSE) is not None
-
@staticmethod
def _transform_rtmp_url(rtmp_video_url):
- m = re.match(r'^rtmpe?://.*?/(?Pgsp.comedystor/.*)$', rtmp_video_url)
+ m = re.match(r'^rtmpe?://.*?/(?Pgsp\.comedystor/.*)$', rtmp_video_url)
if not m:
raise ExtractorError('Cannot transform RTMP url')
base = 'http://mtvnmobile.vo.llnwd.net/kip0/_pxn=1+_pxI0=Ripod-h264+_pxL0=undefined+_pxM0=+_pxK=18639+_pxE=mp4/44620/mtvnorigin/'
@@ -107,9 +95,9 @@ class ComedyCentralShowsIE(InfoExtractor):
if mobj.group('shortname'):
if mobj.group('shortname') in ('tds', 'thedailyshow'):
- url = 'http://www.thedailyshow.com/full-episodes/'
+ url = 'http://thedailyshow.cc.com/full-episodes/'
else:
- url = 'http://www.colbertnation.com/full-episodes/'
+ url = 'http://thecolbertreport.cc.com/full-episodes/'
mobj = re.match(self._VALID_URL, url, re.VERBOSE)
assert mobj is not None
@@ -128,9 +116,9 @@ class ComedyCentralShowsIE(InfoExtractor):
epTitle = mobj.group('showname')
else:
epTitle = mobj.group('episode')
+ show_name = mobj.group('showname')
- self.report_extraction(epTitle)
- webpage,htmlHandle = self._download_webpage_handle(url, epTitle)
+ webpage, htmlHandle = self._download_webpage_handle(url, epTitle)
if dlNewest:
url = htmlHandle.geturl()
mobj = re.match(self._VALID_URL, url, re.VERBOSE)
@@ -138,71 +126,86 @@ class ComedyCentralShowsIE(InfoExtractor):
raise ExtractorError('Invalid redirected URL: ' + url)
if mobj.group('episode') == '':
raise ExtractorError('Redirected URL is still not specific: ' + url)
- epTitle = mobj.group('episode')
+ epTitle = mobj.group('episode').rpartition('/')[-1]
mMovieParams = re.findall('(?: