From: Ricardo Garcia <sarbalap+freshmeat@gmail.com>
Date: Wed, 4 Aug 2010 17:05:53 +0000 (+0200)
Subject: Fix metacafe.com code not working due to gdaKey again (fixes issue #185)
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=109626fcc09d1c27946871d2bdc40b9cdb33d7ee;p=youtube-dl

Fix metacafe.com code not working due to gdaKey again (fixes issue #185)
---

diff --git a/youtube-dl b/youtube-dl
index 266ed5854..09e1349a8 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -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: