From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 15 Dec 2011 19:32:37 +0000 (+0100)
Subject: Release 2011.12.15
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=ba5059dd66310055116e77e0f1c57685830f1b84;p=youtube-dl

Release 2011.12.15
---

diff --git a/LATEST_VERSION b/LATEST_VERSION
index c39abdfcf..20fd28c01 100644
--- a/LATEST_VERSION
+++ b/LATEST_VERSION
@@ -1 +1 @@
-2011.12.08
+2011.12.15
diff --git a/youtube-dl b/youtube-dl
index 6a6033491..c2511e864 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -18,7 +18,7 @@ __author__  = (
 	)
 
 __license__ = 'Public Domain'
-__version__ = '2011.12.08'
+__version__ = '2011.12.15'
 
 UPDATE_URL = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl'
 
@@ -1591,6 +1591,8 @@ class DailymotionIE(InfoExtractor):
 		self._downloader.to_screen(u'[dailymotion] %s: Extracting information' % video_id)
 
 	def _real_extract(self, url):
+		htmlParser = HTMLParser.HTMLParser()
+		
 		# Extract id and simplified title from URL
 		mobj = re.match(self._VALID_URL, url)
 		if mobj is None:
@@ -1601,7 +1603,6 @@ class DailymotionIE(InfoExtractor):
 		self._downloader.increment_downloads()
 		video_id = mobj.group(1)
 
-		simple_title = mobj.group(2).decode('utf-8')
 		video_extension = 'flv'
 
 		# Retrieve video webpage to extract further information
@@ -1631,12 +1632,13 @@ class DailymotionIE(InfoExtractor):
 
 		video_url = mediaURL
 
-		mobj = re.search(r'(?im)<title>\s*(.+)\s*-\s*Video\s+Dailymotion</title>', webpage)
+		mobj = re.search(r'<meta property="og:title" content="(?P<title>[^"]*)" />', webpage)
 		if mobj is None:
 			self._downloader.trouble(u'ERROR: unable to extract title')
 			return
-		video_title = mobj.group(1).decode('utf-8')
+		video_title = htmlParser.unescape(mobj.group('title')).decode('utf-8')
 		video_title = sanitize_title(video_title)
+		simple_title = _simplify_title(video_title)
 
 		mobj = re.search(r'(?im)<span class="owner[^\"]+?">[^<]+?<a [^>]+?>([^<]+?)</a></span>', webpage)
 		if mobj is None:
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index d26019975..c2511e864 100755
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -18,7 +18,7 @@ __author__  = (
 	)
 
 __license__ = 'Public Domain'
-__version__ = '2011.12.08'
+__version__ = '2011.12.15'
 
 UPDATE_URL = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl'