]> git.bitcoin.ninja Git - youtube-dl/blobdiff - youtube_dl/InfoExtractors.py
fixed MetacafeIE (uploader nickname regex) - closes #515
[youtube-dl] / youtube_dl / InfoExtractors.py
index 6e59ba8fd740c789435c3ada8ba0a13dcb2297a8..a5c8b91341079a8d02aab6955ca7edd6761a63bd 100644 (file)
@@ -603,7 +603,7 @@ class MetacafeIE(InfoExtractor):
                        return
                video_title = mobj.group(1).decode('utf-8')
 
-               mobj = re.search(r'(?ms)By:\s*<a .*?>(.+?)<', webpage)
+               mobj = re.search(r'submitter=(.*?);', webpage)
                if mobj is None:
                        self._downloader.trouble(u'ERROR: unable to extract uploader nickname')
                        return
@@ -692,7 +692,7 @@ class DailymotionIE(InfoExtractor):
                video_title = unescapeHTML(mobj.group('title').decode('utf-8'))
 
                video_uploader = u'NA'
-               mobj = re.search(r'(?im)<span class="owner[^\"]+?">[^<]+?<a [^>]+?>([^<]+?)</a></span>', webpage)
+               mobj = re.search(r'(?im)<span class="owner[^\"]+?">[^<]+?<a [^>]+?>([^<]+?)</a>', webpage)
                if mobj is None:
                        self._downloader.trouble(u'WARNING: unable to extract uploader nickname')
                else: