Merge tag 'upstream/2015.06.04.1'

[youtubedl] / youtube_dl / extractor / mailru.py

diff --git a/youtube_dl/extractor/mailru.py b/youtube_dl/extractor/mailru.py
index 7460d81cd501b8c52dcce3caae8313f6854b571a..54a14cb94c93dad587a83c58d58ec3d262f0eed8 100644 (file)
--- a/youtube_dl/extractor/mailru.py
+++ b/youtube_dl/extractor/mailru.py
@@ -16,7 +16,7 @@ class MailRuIE(InfoExtractor):
             'url': 'http://my.mail.ru/video/top#video=/mail/sonypicturesrus/75/76',
             'md5': 'dea205f03120046894db4ebb6159879a',
             'info_dict': {
             'url': 'http://my.mail.ru/video/top#video=/mail/sonypicturesrus/75/76',
             'md5': 'dea205f03120046894db4ebb6159879a',
             'info_dict': {

-                'id': '46301138',
+                'id': '46301138_76',

                 'ext': 'mp4',
                 'title': 'Новый Человек-Паук. Высокое напряжение. Восстание Электро',
                 'timestamp': 1393232740,
                 'ext': 'mp4',
                 'title': 'Новый Человек-Паук. Высокое напряжение. Восстание Электро',
                 'timestamp': 1393232740,


@@ -30,7 +30,7 @@ class MailRuIE(InfoExtractor):
             'url': 'http://my.mail.ru/corp/hitech/video/news_hi-tech_mail_ru/1263.html',
             'md5': '00a91a58c3402204dcced523777b475f',
             'info_dict': {
             'url': 'http://my.mail.ru/corp/hitech/video/news_hi-tech_mail_ru/1263.html',
             'md5': '00a91a58c3402204dcced523777b475f',
             'info_dict': {

-                'id': '46843144',
+                'id': '46843144_1263',

                 'ext': 'mp4',
                 'title': 'Samsung Galaxy S5 Hammer Smash Fail Battery Explosion',
                 'timestamp': 1397217632,
                 'ext': 'mp4',
                 'title': 'Samsung Galaxy S5 Hammer Smash Fail Battery Explosion',
                 'timestamp': 1397217632,


@@ -54,33 +54,36 @@ class MailRuIE(InfoExtractor):
 
         author = video_data['author']
         uploader = author['name']
 
         author = video_data['author']
         uploader = author['name']

-        uploader_id = author['id']
+        uploader_id = author.get('id') or author.get('email')
+        view_count = video_data.get('views_count')

 
 

-        movie = video_data['movie']
-        content_id = str(movie['contentId'])
-        title = movie['title']
+        meta_data = video_data['meta']
+        content_id = '%s_%s' % (
+            meta_data.get('accId', ''), meta_data['itemId'])
+        title = meta_data['title']

         if title.endswith('.mp4'):
             title = title[:-4]
         if title.endswith('.mp4'):
             title = title[:-4]

-        thumbnail = movie['poster']
-        duration = movie['duration']
-
-        view_count = video_data['views_count']
+        thumbnail = meta_data['poster']
+        duration = meta_data['duration']
+        timestamp = meta_data['timestamp']

 
         formats = [
             {
                 'url': video['url'],
 
         formats = [
             {
                 'url': video['url'],

-                'format_id': video['name'],
+                'format_id': video['key'],
+                'height': int(video['key'].rstrip('p'))

             } for video in video_data['videos']
         ]
             } for video in video_data['videos']
         ]

+        self._sort_formats(formats)

 
         return {
             'id': content_id,
             'title': title,
             'thumbnail': thumbnail,
 
         return {
             'id': content_id,
             'title': title,
             'thumbnail': thumbnail,

-            'timestamp': video_data['timestamp'],
+            'timestamp': timestamp,

             'uploader': uploader,
             'uploader_id': uploader_id,
             'duration': duration,
             'view_count': view_count,
             'formats': formats,
             'uploader': uploader,
             'uploader_id': uploader_id,
             'duration': duration,
             'view_count': view_count,
             'formats': formats,

-        }
\ No newline at end of file
+        }