Roxedus/ytdl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[comedycentral] Prepare for generic video extraction (#980)

Browse Source
This commit is contained in:
Philipp Hagemeister 2013-10-04 11:14:10 +02:00
parent f13d09332d
commit d93bdee9a6
1 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
youtube_dl/extractor/comedycentral.py
View File

@ -51,12 +51,12 @@ class ComedyCentralIE(InfoExtractor):
'400': 'mp4', '400': 'mp4',
} }
_video_dimensions = { _video_dimensions = {
'3500': '1280x720', '3500': (1280, 720),
'2200': '960x540', '2200': (960, 540),
'1700': '768x432', '1700': (768, 432),
'1200': '640x360', '1200': (640, 360),
'750': '512x288', '750': (512, 288),
'400': '384x216', '400': (384, 216),
} }
@classmethod @classmethod
@ -64,11 +64,13 @@ class ComedyCentralIE(InfoExtractor):
"""Receives a URL and returns True if suitable for this IE.""" """Receives a URL and returns True if suitable for this IE."""
return re.match(cls._VALID_URL, url, re.VERBOSE) is not None return re.match(cls._VALID_URL, url, re.VERBOSE) is not None
def _print_formats(self, formats): @staticmethod
print('Available formats:') def _transform_rtmp_url(rtmp_video_url):
for x in formats: m = re.match(r'^rtmpe?://.*?/(?P<finalid>gsp.comedystor/.*)$', rtmp_video_url)
print('%s\t:\t%s\t[%s]' %(x, self._video_extensions.get(x, 'mp4'), self._video_dimensions.get(x, '???'))) if not m:
raise ExtractorError(u'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): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url, re.VERBOSE) mobj = re.match(self._VALID_URL, url, re.VERBOSE)
@ -155,40 +157,31 @@ class ComedyCentralIE(InfoExtractor):
self._downloader.report_error(u'unable to download ' + mediaId + ': No videos found') self._downloader.report_error(u'unable to download ' + mediaId + ': No videos found')
continue continue
if self._downloader.params.get('listformats', None): formats = []
self._print_formats([i[0] for i in turls]) for format, rtmp_video_url in turls:
return w, h = self._video_dimensions.get(format, (None, None))
formats.append({
# For now, just pick the highest bitrate 'url': self._transform_rtmp_url(rtmp_video_url),
format,rtmp_video_url = turls[-1] 'ext': self._video_extensions.get(format, 'mp4'),
'format_id': format,
# Get the format arg from the arg stream 'height': h,
req_format = self._downloader.params.get('format', None) 'width': w,
})
# Select format if we can find one
for f,v in turls:
if f == req_format:
format, rtmp_video_url = f, v
break
m = re.match(r'^rtmpe?://.*?/(?P<finalid>gsp.comedystor/.*)$', rtmp_video_url)
if not m:
raise ExtractorError(u'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/'
video_url = base + m.group('finalid')
effTitle = showId + u'-' + epTitle + u' part ' + compat_str(partNum+1) effTitle = showId + u'-' + epTitle + u' part ' + compat_str(partNum+1)
info = { info = {
'id': shortMediaId, 'id': shortMediaId,
'url': video_url, 'formats': formats,
'uploader': showId, 'uploader': showId,
'upload_date': officialDate, 'upload_date': officialDate,
'title': effTitle, 'title': effTitle,
'ext': 'mp4',
'format': format,
'thumbnail': None, 'thumbnail': None,
'description': compat_str(officialTitle), 'description': compat_str(officialTitle),
} }
# TODO: Remove when #980 has been merged
info.update(info['formats'][-1])
results.append(info) results.append(info)
return results return results