about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-12-10 19:44:16 +0100
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-12-10 19:44:16 +0100
commit7c86cd5ab1c8e9091c42eaae7354520a708f7431 (patch)
treede78f3116228270ba80547a7c0ea0e14c68c91ac
parentcbfc4702280dcf26b76a1e2be151cdb97a293f4d (diff)
downloadyoutube-dl-7c86cd5ab1c8e9091c42eaae7354520a708f7431.tar.gz
youtube-dl-7c86cd5ab1c8e9091c42eaae7354520a708f7431.tar.xz
youtube-dl-7c86cd5ab1c8e9091c42eaae7354520a708f7431.zip
[dailymotion] Fix uploader extraction
Now it looks directly in the info dictionary
-rw-r--r--youtube_dl/extractor/dailymotion.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/youtube_dl/extractor/dailymotion.py b/youtube_dl/extractor/dailymotion.py
index 3bd0b862c..7f2f0d6a4 100644
--- a/youtube_dl/extractor/dailymotion.py
+++ b/youtube_dl/extractor/dailymotion.py
@@ -101,10 +101,6 @@ class DailymotionIE(DailymotionBaseInfoExtractor, SubtitlesInfoExtractor):
             self.to_screen(u'Vevo video detected: %s' % vevo_id)
             return self.url_result(u'vevo:%s' % vevo_id, ie='Vevo')
 
-        video_uploader = self._search_regex([r'(?im)<span class="owner[^\"]+?">[^<]+?<a [^>]+?>([^<]+?)</a>',
-                                             # Looking for official user
-                                             r'<(?:span|a) .*?rel="author".*?>([^<]+?)</'],
-                                            webpage, 'video uploader', fatal=False)
         age_limit = self._rta_search(webpage)
 
         video_upload_date = None
@@ -153,7 +149,7 @@ class DailymotionIE(DailymotionBaseInfoExtractor, SubtitlesInfoExtractor):
         return {
             'id':       video_id,
             'formats': formats,
-            'uploader': video_uploader,
+            'uploader': info['owner_screenname'],
             'upload_date':  video_upload_date,
             'title':    self._og_search_title(webpage),
             'subtitles':    video_subtitles,