]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
DailymotionIE: simplify the extraction of the title and remove an unused assignment...
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Fri, 5 Jul 2013 12:20:15 +0000 (14:20 +0200)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Fri, 5 Jul 2013 12:20:15 +0000 (14:20 +0200)
youtube_dl/extractor/dailymotion.py

index 0b47d652a678c992a0ed08a02becd75e0de7af6a..e15ea549a4e162bb29d3a6521cb6901c988a9baa 100644 (file)
@@ -6,7 +6,6 @@ from ..utils import (
     compat_urllib_request,
 
     ExtractorError,
-    unescapeHTML,
 )
 
 class DailymotionIE(InfoExtractor):
@@ -40,13 +39,9 @@ class DailymotionIE(InfoExtractor):
         # Extract URL, uploader and title from webpage
         self.report_extraction(video_id)
 
+        video_title = self._html_search_regex(r'<meta property="og:title" content="(.*?)" />',
+                                              webpage, 'title')
 
-        mobj = re.search(r'<meta property="og:title" content="(?P<title>[^"]*)" />', webpage)
-        if mobj is None:
-            raise ExtractorError(u'Unable to extract title')
-        video_title = unescapeHTML(mobj.group('title'))
-
-        video_uploader = None
         video_uploader = self._search_regex([r'(?im)<span class="owner[^\"]+?">[^<]+?<a [^>]+?>([^<]+?)</a>',
                                              # Looking for official user
                                              r'<(?:span|a) .*?rel="author".*?>([^<]+?)</'],