From: Jaime Marquínez Ferrándiz Date: Thu, 20 Jun 2013 12:15:29 +0000 (+0200) Subject: DailymotionIE: fix the extraction of the video uploader and use _search_regex for... X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=587c68b2cdef65766d4dc408b04bd67cf8d2daf2;p=youtube-dl DailymotionIE: fix the extraction of the video uploader and use _search_regex for getting it --- diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index 59f65aca3..c80a74ef6 100755 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -940,16 +940,10 @@ class DailymotionIE(InfoExtractor): video_title = unescapeHTML(mobj.group('title')) video_uploader = None - mobj = re.search(r'(?im)[^<]+?]+?>([^<]+?)', webpage) - if mobj is None: - # lookin for official user - mobj_official = re.search(r'', webpage) - if mobj_official is None: - self._downloader.report_warning(u'unable to extract uploader nickname') - else: - video_uploader = mobj_official.group(1) - else: - video_uploader = mobj.group(1) + video_uploader = self._search_regex([r'(?im)[^<]+?]+?>([^<]+?)', + # Looking for official user + r'<(?:span|a) .*?rel="author".*?>([^<]+?)([0-9]{2})-([0-9]{2})-([0-9]{4})', webpage)