From 5fee0eeac04d0d63c1c1b78a35c5ed8b086f7d0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Fri, 14 Nov 2014 18:34:44 +0100 Subject: [ComedyCentralShows] Use the rtmp urls transform function from the MTV IE (fixes #3364) It produces the right mp4 urls, so we stop prefering the rtmp urls. --- youtube_dl/extractor/comedycentral.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'youtube_dl') diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dl/extractor/comedycentral.py index 035046120..49b978b4e 100644 --- a/youtube_dl/extractor/comedycentral.py +++ b/youtube_dl/extractor/comedycentral.py @@ -31,7 +31,7 @@ class ComedyCentralIE(MTVServicesInfoExtractor): } -class ComedyCentralShowsIE(InfoExtractor): +class ComedyCentralShowsIE(MTVServicesInfoExtractor): IE_DESC = 'The Daily Show / The Colbert Report' # urls can be abbreviations like :thedailyshow or :colbert # urls for episodes like: @@ -109,14 +109,6 @@ class ComedyCentralShowsIE(InfoExtractor): '400': (384, 216), } - @staticmethod - def _transform_rtmp_url(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/' - return base + m.group('finalid') - def _real_extract(self, url): mobj = re.match(self._VALID_URL, url, re.VERBOSE) if mobj is None: @@ -212,9 +204,6 @@ class ComedyCentralShowsIE(InfoExtractor): 'ext': self._video_extensions.get(format, 'mp4'), 'height': h, 'width': w, - - 'format_note': 'HTTP 400 at the moment (patches welcome!)', - 'preference': -100, }) formats.append({ 'format_id': 'rtmp-%s' % format, -- cgit v1.2.3