Merge remote-tracking branch 'alphapapa/master'

[youtube-dl] / youtube_dl / extractor / metacafe.py

diff --git a/youtube_dl/extractor/metacafe.py b/youtube_dl/extractor/metacafe.py
index 94d9ef62f44ece41df5a927f22f7c8b6b4448309..e537648ffb83564e56f43f7e1e21a949cc609925 100644 (file)
--- a/youtube_dl/extractor/metacafe.py
+++ b/youtube_dl/extractor/metacafe.py
@@ -37,7 +37,8 @@ class MetacafeIE(InfoExtractor):
         u"file": u"an-dVVXnuY7Jh77J.mp4",
         u"info_dict": {
             u"title": u"The Andromeda Strain (1971): Stop the Bomb Part 3",
-            u"uploader": u"AnyClip",
+            u"uploader": u"anyclip",
+            u"description": u"md5:38c711dd98f5bb87acf973d573442e67"
         }
     }]
 
@@ -119,13 +120,18 @@ class MetacafeIE(InfoExtractor):
                 video_ext = determine_ext(video_url)
 
         video_title = self._html_search_regex(r'(?im)<title>(.*) - Video</title>', webpage, u'title')
-        video_uploader = self._html_search_regex(r'submitter=(.*?);|<p class="By">\s*By\s*<a[^>]*>(.*?)</a>', webpage, u'uploader nickname', fatal=False)
+        description = self._og_search_description(webpage)
+        video_uploader = self._html_search_regex(
+                r'submitter=(.*?);|googletag\.pubads\(\)\.setTargeting\("(?:channel|submiter)","([^"]+)"\);',
+                webpage, u'uploader nickname', fatal=False)
 
-        return [{
+        return {
+            '_type':    'video',
             'id':       video_id,
             'url':      video_url,
+            'description': description,
             'uploader': video_uploader,
             'upload_date':  None,
             'title':    video_title,
             'ext':      video_ext,
-        }]
+        }