pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-14 06:18:00 +09:00
Code Issues Projects Releases Wiki Activity

Fix some metacafe videos, closes #562

Browse Source
This commit is contained in:
Jaime Marquínez Ferrándiz 2013-04-20 12:06:58 +02:00
parent 089e843b0f
commit f7a9721e16
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/InfoExtractors.py
View File

@ -731,8 +731,7 @@ class MetacafeIE(InfoExtractor):
return [self.url_result('http://www.youtube.com/watch?v=%s' % mobj2.group(1))] return [self.url_result('http://www.youtube.com/watch?v=%s' % mobj2.group(1))]
# Retrieve video webpage to extract further information # Retrieve video webpage to extract further information
request = compat_urllib_request.Request('http://www.metacafe.com/watch/%s/' % video_id) webpage = self._download_webpage('http://www.metacafe.com/watch/%s/' % video_id, video_id)
webpage = self._download_webpage(request, video_id)
# Extract URL, uploader and title from webpage # Extract URL, uploader and title from webpage
self.report_extraction(video_id) self.report_extraction(video_id)
@ -757,13 +756,13 @@ class MetacafeIE(InfoExtractor):
if 'mediaData' not in vardict: if 'mediaData' not in vardict:
self._downloader.report_error(u'unable to extract media URL') self._downloader.report_error(u'unable to extract media URL')
return return
mobj = re.search(r'"mediaURL":"(http.*?)","key":"(.*?)"', vardict['mediaData'][0]) mobj = re.search(r'"mediaURL":"(?P<mediaURL>http.*?)",(.*?)"key":"(?P<key>.*?)"', vardict['mediaData'][0])
if mobj is None: if mobj is None:
self._downloader.report_error(u'unable to extract media URL') self._downloader.report_error(u'unable to extract media URL')
return return
mediaURL = mobj.group(1).replace('\\/', '/') mediaURL = mobj.group('mediaURL').replace('\\/', '/')
video_extension = mediaURL[-3:] video_extension = mediaURL[-3:]
video_url = '%s?__gda__=%s' % (mediaURL, mobj.group(2)) video_url = '%s?__gda__=%s' % (mediaURL, mobj.group('key'))
mobj = re.search(r'(?im)<title>(.*) - Video</title>', webpage) mobj = re.search(r'(?im)<title>(.*) - Video</title>', webpage)
if mobj is None: if mobj is None: