w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

DailymotionIE: simplify the extraction of the title and remove an unused assignment of video_uploader

Browse source
This commit is contained in:
Jaime Marquínez Ferrándiz 2013-07-05 14:20:15 +02:00
parent b27c856fbc
commit 2491f5898e
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
youtube_dl/extractor/dailymotion.py
View file

@ -6,7 +6,6 @@ from ..utils import (
compat_urllib_request, compat_urllib_request,
ExtractorError, ExtractorError,
unescapeHTML,
) )
class DailymotionIE(InfoExtractor): class DailymotionIE(InfoExtractor):
@ -40,13 +39,9 @@ class DailymotionIE(InfoExtractor):
# Extract URL, uploader and title from webpage # Extract URL, uploader and title from webpage
self.report_extraction(video_id) 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>', video_uploader = self._search_regex([r'(?im)<span class="owner[^\"]+?">[^<]+?<a [^>]+?>([^<]+?)</a>',
# Looking for official user # Looking for official user
r'<(?:span|a) .*?rel="author".*?>([^<]+?)</'], r'<(?:span|a) .*?rel="author".*?>([^<]+?)</'],