youtube-dl

commit 18963a36b060526d89114fa019cd65e1fc425f9b
parent df1ceb1fd9d18b873ff3e6e2756e871cf1e394f8
Author: Ricardo Garcia <sarbalap+freshmeat@gmail.com>
Date:   Sun,  2 Aug 2009 12:18:52 +0200

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

Diffstat:
M
youtube-dl
 | 
16
+++++++++-------

1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/youtube-dl b/youtube-dl
@@ -821,19 +821,21 @@ class MetacafeIE(InfoExtractor):
 
 		# Extract URL, uploader and title from webpage
 		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:
 			self._downloader.trouble(u'ERROR: unable to extract media URL')
 			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)
+		#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 = '%s?__gda__=%s' % (mediaURL, gdaKey)
+		video_url = mediaURL
 
 		mobj = re.search(r'(?im)<title>(.*) - Video</title>', webpage)
 		if mobj is None: