X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fcomedycentral.py;h=4cac294153f166b676f1bdcdb2d47ee9e5fdf693;hb=4d32b6385160e8cf9117839022ed795ce02b107d;hp=91ebb0ce57136dc0076927acdca4e250774746e1;hpb=7691a7a3bd77dd2c169a9a8592283d99a9266973;p=youtube-dl.git
diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dl/extractor/comedycentral.py
index 91ebb0ce5..4cac29415 100644
--- a/youtube_dl/extractor/comedycentral.py
+++ b/youtube_dl/extractor/comedycentral.py
@@ -1,274 +1,138 @@
from __future__ import unicode_literals
-import re
-
from .mtv import MTVServicesInfoExtractor
-from ..compat import (
- compat_str,
- compat_urllib_parse,
-)
-from ..utils import (
- ExtractorError,
- float_or_none,
- unified_strdate,
-)
+from .common import InfoExtractor
class ComedyCentralIE(MTVServicesInfoExtractor):
_VALID_URL = r'''(?x)https?://(?:www\.)?cc\.com/
- (video-clips|episodes|cc-studios|video-collections|full-episodes)
+ (video-clips|episodes|cc-studios|video-collections|shows(?=/[^/]+/(?!full-episodes)))
/(?P
.*)'''
_FEED_URL = 'http://comedycentral.com/feeds/mrss/'
- _TEST = {
+ _TESTS = [{
'url': 'http://www.cc.com/video-clips/kllhuv/stand-up-greg-fitzsimmons--uncensored---too-good-of-a-mother',
'md5': 'c4f48e9eda1b16dd10add0744344b6d8',
'info_dict': {
'id': 'cef0cbb3-e776-4bc9-b62e-8016deccb354',
'ext': 'mp4',
- 'title': 'CC:Stand-Up|Greg Fitzsimmons: Life on Stage|Uncensored - Too Good of a Mother',
+ 'title': 'CC:Stand-Up|August 18, 2013|1|0101|Uncensored - Too Good of a Mother',
'description': 'After a certain point, breastfeeding becomes c**kblocking.',
+ 'timestamp': 1376798400,
+ 'upload_date': '20130818',
},
- }
+ }, {
+ 'url': 'http://www.cc.com/shows/the-daily-show-with-trevor-noah/interviews/6yx39d/exclusive-rand-paul-extended-interview',
+ 'only_matching': True,
+ }]
+
+class ComedyCentralFullEpisodesIE(MTVServicesInfoExtractor):
+ _VALID_URL = r'''(?x)https?://(?:www\.)?cc\.com/
+ (?:full-episodes|shows(?=/[^/]+/full-episodes))
+ /(?P[^?]+)'''
+ _FEED_URL = 'http://comedycentral.com/feeds/mrss/'
-class ComedyCentralShowsIE(MTVServicesInfoExtractor):
- IE_DESC = 'The Daily Show / The Colbert Report'
- # urls can be abbreviations like :thedailyshow
- # 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'''(?x)^(:(?Ptds|thedailyshow)
- |https?://(:www\.)?
- (?Pthedailyshow|thecolbertreport)\.(?:cc\.)?com/
- ((?:full-)?episodes/(?:[0-9a-z]{6}/)?(?P.*)|
- (?P
- (?:(?:guests/[^/]+|videos|video-playlists|special-editions|news-team/[^/]+)/[^/]+/(?P[^/?#]+))
- |(the-colbert-report-(videos|collections)/(?P[0-9]+)/[^/]*/(?P.*?))
- |(watch/(?P[^/]*)/(?P.*))
- )|
- (?P
- extended-interviews/(?P[0-9a-z]+)/
- (?:playlist_tds_extended_)?(?P[^/?#]*?)
- (?:/[^/?#]?|[?#]|$))))
- '''
_TESTS = [{
- 'url': 'http://thedailyshow.cc.com/watch/thu-december-13-2012/kristen-stewart',
- 'md5': '4e2f5cb088a83cd8cdb7756132f9739d',
+ 'url': 'http://www.cc.com/full-episodes/pv391a/the-daily-show-with-trevor-noah-november-28--2016---ryan-speedo-green-season-22-ep-22028',
'info_dict': {
- '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',
- }
+ 'description': 'Donald Trump is accused of exploiting his president-elect status for personal gain, Cuban leader Fidel Castro dies, and Ryan Speedo Green discusses "Sing for Your Life."',
+ 'title': 'November 28, 2016 - Ryan Speedo Green',
+ },
+ 'playlist_count': 4,
}, {
- 'url': 'http://thedailyshow.cc.com/extended-interviews/b6364d/sarah-chayes-extended-interview',
+ 'url': 'http://www.cc.com/shows/the-daily-show-with-trevor-noah/full-episodes',
+ 'only_matching': True,
+ }]
+
+ def _real_extract(self, url):
+ playlist_id = self._match_id(url)
+ webpage = self._download_webpage(url, playlist_id)
+ mgid = self._extract_triforce_mgid(webpage, data_zone='t2_lc_promo1')
+ videos_info = self._get_videos_info(mgid)
+ return videos_info
+
+
+class ToshIE(MTVServicesInfoExtractor):
+ IE_DESC = 'Tosh.0'
+ _VALID_URL = r'^https?://tosh\.cc\.com/video-(?:clips|collections)/[^/]+/(?P[^/?#]+)'
+ _FEED_URL = 'http://tosh.cc.com/feeds/mrss'
+
+ _TESTS = [{
+ 'url': 'http://tosh.cc.com/video-clips/68g93d/twitter-users-share-summer-plans',
'info_dict': {
- 'id': 'sarah-chayes-extended-interview',
- 'description': 'Carnegie Endowment Senior Associate Sarah Chayes discusses how corrupt institutions function throughout the world in her book "Thieves of State: Why Corruption Threatens Global Security."',
- 'title': 'thedailyshow Sarah Chayes Extended Interview',
+ 'description': 'Tosh asked fans to share their summer plans.',
+ 'title': 'Twitter Users Share Summer Plans',
},
- 'playlist': [
- {
- 'info_dict': {
- 'id': '0baad492-cbec-4ec1-9e50-ad91c291127f',
- 'ext': 'mp4',
- 'upload_date': '20150129',
- 'description': 'Carnegie Endowment Senior Associate Sarah Chayes discusses how corrupt institutions function throughout the world in her book "Thieves of State: Why Corruption Threatens Global Security."',
- 'uploader': 'thedailyshow',
- 'title': 'thedailyshow sarah-chayes-extended-interview part 1',
- },
- },
- {
- 'info_dict': {
- 'id': '1e4fb91b-8ce7-4277-bd7c-98c9f1bbd283',
- 'ext': 'mp4',
- 'upload_date': '20150129',
- 'description': 'Carnegie Endowment Senior Associate Sarah Chayes discusses how corrupt institutions function throughout the world in her book "Thieves of State: Why Corruption Threatens Global Security."',
- 'uploader': 'thedailyshow',
- 'title': 'thedailyshow sarah-chayes-extended-interview part 2',
+ 'playlist': [{
+ 'md5': 'f269e88114c1805bb6d7653fecea9e06',
+ 'info_dict': {
+ 'id': '90498ec2-ed00-11e0-aca6-0026b9414f30',
+ 'ext': 'mp4',
+ 'title': 'Tosh.0|June 9, 2077|2|211|Twitter Users Share Summer Plans',
+ 'description': 'Tosh asked fans to share their summer plans.',
+ 'thumbnail': r're:^https?://.*\.jpg',
+ # It's really reported to be published on year 2077
+ 'upload_date': '20770610',
+ 'timestamp': 3390510600,
+ 'subtitles': {
+ 'en': 'mincount:3',
},
},
- ],
+ }]
+ }, {
+ 'url': 'http://tosh.cc.com/video-collections/x2iz7k/just-plain-foul/m5q4fp',
+ 'only_matching': True,
+ }]
+
+
+class ComedyCentralTVIE(MTVServicesInfoExtractor):
+ _VALID_URL = r'https?://(?:www\.)?comedycentral\.tv/(?:staffeln|shows)/(?P[^/?#&]+)'
+ _TESTS = [{
+ 'url': 'http://www.comedycentral.tv/staffeln/7436-the-mindy-project-staffel-4',
+ 'info_dict': {
+ 'id': 'local_playlist-f99b626bdfe13568579a',
+ 'ext': 'flv',
+ 'title': 'Episode_the-mindy-project_shows_season-4_episode-3_full-episode_part1',
+ },
'params': {
+ # rtmp download
'skip_download': True,
},
}, {
- 'url': 'http://thedailyshow.cc.com/extended-interviews/xm3fnq/andrew-napolitano-extended-interview',
- 'only_matching': True,
- }, {
- 'url': 'http://thecolbertreport.cc.com/videos/29w6fx/-realhumanpraise-for-fox-news',
+ 'url': 'http://www.comedycentral.tv/shows/1074-workaholics',
'only_matching': True,
}, {
- 'url': 'http://thecolbertreport.cc.com/videos/gh6urb/neil-degrasse-tyson-pt--1?xrs=eml_col_031114',
- 'only_matching': True,
- }, {
- 'url': 'http://thedailyshow.cc.com/guests/michael-lewis/3efna8/exclusive---michael-lewis-extended-interview-pt--3',
- 'only_matching': True,
- }, {
- 'url': 'http://thedailyshow.cc.com/episodes/sy7yv0/april-8--2014---denis-leary',
- 'only_matching': True,
- }, {
- 'url': 'http://thecolbertreport.cc.com/episodes/8ase07/april-8--2014---jane-goodall',
- 'only_matching': True,
- }, {
- 'url': 'http://thedailyshow.cc.com/video-playlists/npde3s/the-daily-show-19088-highlights',
- 'only_matching': True,
- }, {
- 'url': 'http://thedailyshow.cc.com/video-playlists/t6d9sg/the-daily-show-20038-highlights/be3cwo',
- 'only_matching': True,
- }, {
- 'url': 'http://thedailyshow.cc.com/special-editions/2l8fdb/special-edition---a-look-back-at-food',
- 'only_matching': True,
- }, {
- 'url': 'http://thedailyshow.cc.com/news-team/michael-che/7wnfel/we-need-to-talk-about-israel',
+ 'url': 'http://www.comedycentral.tv/shows/1727-the-mindy-project/bonus',
'only_matching': True,
}]
- _available_formats = ['3500', '2200', '1700', '1200', '750', '400']
-
- _video_extensions = {
- '3500': 'mp4',
- '2200': 'mp4',
- '1700': 'mp4',
- '1200': 'mp4',
- '750': 'mp4',
- '400': 'mp4',
- }
- _video_dimensions = {
- '3500': (1280, 720),
- '2200': (960, 540),
- '1700': (768, 432),
- '1200': (640, 360),
- '750': (512, 288),
- '400': (384, 216),
- }
-
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
-
- if mobj.group('shortname'):
- if mobj.group('shortname') in ('tds', 'thedailyshow'):
- url = 'http://thedailyshow.cc.com/full-episodes/'
- else:
- url = 'http://thecolbertreport.cc.com/full-episodes/'
- mobj = re.match(self._VALID_URL, url, re.VERBOSE)
- assert mobj is not None
+ video_id = self._match_id(url)
- if mobj.group('clip'):
- if mobj.group('videotitle'):
- epTitle = mobj.group('videotitle')
- elif mobj.group('showname') == 'thedailyshow':
- epTitle = mobj.group('tdstitle')
- else:
- epTitle = mobj.group('cntitle')
- dlNewest = False
- elif mobj.group('interview'):
- epTitle = mobj.group('interview_title')
- dlNewest = False
- else:
- dlNewest = not mobj.group('episode')
- if dlNewest:
- epTitle = mobj.group('showname')
- else:
- epTitle = mobj.group('episode')
- show_name = mobj.group('showname')
+ webpage = self._download_webpage(url, video_id)
- webpage, htmlHandle = self._download_webpage_handle(url, epTitle)
- if dlNewest:
- url = htmlHandle.geturl()
- mobj = re.match(self._VALID_URL, url, re.VERBOSE)
- if mobj is None:
- raise ExtractorError('Invalid redirected URL: ' + url)
- if mobj.group('episode') == '':
- raise ExtractorError('Redirected URL is still not specific: ' + url)
- epTitle = (mobj.group('episode') or mobj.group('videotitle')).rpartition('/')[-1]
+ mrss_url = self._search_regex(
+ r'data-mrss=(["\'])(?P(?:(?!\1).)+)\1',
+ webpage, 'mrss url', group='url')
- mMovieParams = re.findall('(?:tds|thedailyshow)$'
+ _TESTS = [{
+ 'url': ':tds',
+ 'only_matching': True,
+ }, {
+ 'url': ':thedailyshow',
+ 'only_matching': True,
+ }]
- return {
- '_type': 'playlist',
- 'id': epTitle,
- 'entries': entries,
- 'title': show_name + ' ' + title,
- 'description': description,
+ def _real_extract(self, url):
+ video_id = self._match_id(url)
+ shortcut_map = {
+ 'tds': 'http://www.cc.com/shows/the-daily-show-with-trevor-noah/full-episodes',
+ 'thedailyshow': 'http://www.cc.com/shows/the-daily-show-with-trevor-noah/full-episodes',
}
+ return self.url_result(shortcut_map[video_id])