Fix metacafe.com code due to recent changes in the site

This commit is contained in:
Ricardo Garcia 2009-08-02 12:18:52 +02:00
parent df1ceb1fd9
commit 18963a36b0

View File

@ -821,19 +821,21 @@ class MetacafeIE(InfoExtractor):
# Extract URL, uploader and title from webpage # Extract URL, uploader and title from webpage
self.report_extraction(video_id) self.report_extraction(video_id)
mobj = re.search(r'(?m)&mediaURL=(http.*?\.flv)', webpage) mobj = re.search(r'(?m)&mediaURL=([^&]+)', webpage)
if mobj is None: if mobj is None:
self._downloader.trouble(u'ERROR: unable to extract media URL') self._downloader.trouble(u'ERROR: unable to extract media URL')
return return
mediaURL = urllib.unquote(mobj.group(1)) mediaURL = urllib.unquote(mobj.group(1))
mobj = re.search(r'(?m)&gdaKey=(.*?)&', webpage) #mobj = re.search(r'(?m)&gdaKey=(.*?)&', webpage)
if mobj is None: #if mobj is None:
self._downloader.trouble(u'ERROR: unable to extract gdaKey') # self._downloader.trouble(u'ERROR: unable to extract gdaKey')
return # return
gdaKey = mobj.group(1) #gdaKey = mobj.group(1)
#
#video_url = '%s?__gda__=%s' % (mediaURL, gdaKey)
video_url = '%s?__gda__=%s' % (mediaURL, gdaKey) video_url = mediaURL
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: