|
@@ -1039,15 +1039,15 @@ class MetacafeIE(InfoExtractor):
|
|
|
return
|
|
|
mediaURL = urllib.unquote(mobj.group(1))
|
|
|
|
|
|
- #mobj = re.search(r'(?m)&gdaKey=(.*?)&', webpage)
|
|
|
- #if mobj is None:
|
|
|
- # self._downloader.trouble(u'ERROR: unable to extract gdaKey')
|
|
|
- # return
|
|
|
- #gdaKey = mobj.group(1)
|
|
|
- #
|
|
|
- #video_url = '%s?__gda__=%s' % (mediaURL, gdaKey)
|
|
|
-
|
|
|
- video_url = mediaURL
|
|
|
+ # Extract gdaKey if available
|
|
|
+ mobj = re.search(r'(?m)&gdaKey=(.*?)&', webpage)
|
|
|
+ if mobj is None:
|
|
|
+ video_url = mediaURL
|
|
|
+ #self._downloader.trouble(u'ERROR: unable to extract gdaKey')
|
|
|
+ #return
|
|
|
+ else:
|
|
|
+ gdaKey = mobj.group(1)
|
|
|
+ video_url = '%s?__gda__=%s' % (mediaURL, gdaKey)
|
|
|
|
|
|
mobj = re.search(r'(?im)<title>(.*) - Video</title>', webpage)
|
|
|
if mobj is None:
|