Merge tag 'upstream/2016.08.17'

[youtubedl] / youtube_dl / extractor / mtv.py

diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py
index ed068365d3d4936d35e2e62146f1dcbec750728b..2f455680ebba41074513f7dd33b76e5c269cb142 100644 (file)
--- a/youtube_dl/extractor/mtv.py
+++ b/youtube_dl/extractor/mtv.py
@@ -4,8 +4,9 @@ import re
 
 from .common import InfoExtractor
 from ..compat import (
 
 from .common import InfoExtractor
 from ..compat import (

-    compat_urllib_parse,
+    compat_urllib_parse_urlencode,

     compat_str,
     compat_str,

+    compat_xpath,

 )
 from ..utils import (
     ExtractorError,
 )
 from ..utils import (
     ExtractorError,


@@ -14,9 +15,12 @@ from ..utils import (
     float_or_none,
     HEADRequest,
     sanitized_Request,
     float_or_none,
     HEADRequest,
     sanitized_Request,

+    strip_or_none,
+    timeconvert,

     unescapeHTML,
     url_basename,
     RegexNotFoundError,
     unescapeHTML,
     url_basename,
     RegexNotFoundError,

+    xpath_text,

 )
 
 
 )
 
 


@@ -33,13 +37,13 @@ class MTVServicesInfoExtractor(InfoExtractor):
         return uri.split(':')[-1]
 
     # This was originally implemented for ComedyCentral, but it also works here
         return uri.split(':')[-1]
 
     # This was originally implemented for ComedyCentral, but it also works here

-    @staticmethod
-    def _transform_rtmp_url(rtmp_video_url):
+    @classmethod
+    def _transform_rtmp_url(cls, rtmp_video_url):

         m = re.match(r'^rtmpe?://.*?/(?P<finalid>gsp\..+?/.*)$', rtmp_video_url)
         if not m:
         m = re.match(r'^rtmpe?://.*?/(?P<finalid>gsp\..+?/.*)$', rtmp_video_url)
         if not m:

-            return rtmp_video_url
+            return {'rtmp': rtmp_video_url}

         base = 'http://viacommtvstrmfs.fplive.net/'
         base = 'http://viacommtvstrmfs.fplive.net/'

-        return base + m.group('finalid')
+        return {'http': base + m.group('finalid')}

 
     def _get_feed_url(self, uri):
         return self._FEED_URL
 
     def _get_feed_url(self, uri):
         return self._FEED_URL


@@ -83,13 +87,14 @@ class MTVServicesInfoExtractor(InfoExtractor):
                 rtmp_video_url = rendition.find('./src').text
                 if rtmp_video_url.endswith('siteunavail.png'):
                     continue
                 rtmp_video_url = rendition.find('./src').text
                 if rtmp_video_url.endswith('siteunavail.png'):
                     continue

-                formats.append({
-                    'ext': ext,
-                    'url': self._transform_rtmp_url(rtmp_video_url),
-                    'format_id': rendition.get('bitrate'),
+                new_urls = self._transform_rtmp_url(rtmp_video_url)
+                formats.extend([{
+                    'ext': 'flv' if new_url.startswith('rtmp') else ext,
+                    'url': new_url,
+                    'format_id': '-'.join(filter(None, [kind, rendition.get('bitrate')])),

                     'width': int(rendition.get('width')),
                     'height': int(rendition.get('height')),
                     'width': int(rendition.get('width')),
                     'height': int(rendition.get('height')),

-                })
+                } for kind, new_url in new_urls.items()])

             except (KeyError, TypeError):
                 raise ExtractorError('Invalid rendition field.')
         self._sort_formats(formats)
             except (KeyError, TypeError):
                 raise ExtractorError('Invalid rendition field.')
         self._sort_formats(formats)


@@ -130,11 +135,9 @@ class MTVServicesInfoExtractor(InfoExtractor):
             message += item.text
             raise ExtractorError(message, expected=True)
 
             message += item.text
             raise ExtractorError(message, expected=True)
 

-        description_node = itemdoc.find('description')
-        if description_node is not None:
-            description = description_node.text.strip()
-        else:
-            description = None
+        description = strip_or_none(xpath_text(itemdoc, 'description'))
+
+        timestamp = timeconvert(xpath_text(itemdoc, 'pubDate'))

 
         title_el = None
         if title_el is None:
 
         title_el = None
         if title_el is None:


@@ -142,9 +145,9 @@ class MTVServicesInfoExtractor(InfoExtractor):
                 itemdoc, './/{http://search.yahoo.com/mrss/}category',
                 'scheme', 'urn:mtvn:video_title')
         if title_el is None:
                 itemdoc, './/{http://search.yahoo.com/mrss/}category',
                 'scheme', 'urn:mtvn:video_title')
         if title_el is None:

-            title_el = itemdoc.find('.//{http://search.yahoo.com/mrss/}title')
+            title_el = itemdoc.find(compat_xpath('.//{http://search.yahoo.com/mrss/}title'))

         if title_el is None:
         if title_el is None:

-            title_el = itemdoc.find('.//title') or itemdoc.find('./title')
+            title_el = itemdoc.find(compat_xpath('.//title'))

             if title_el.text is None:
                 title_el = None
 
             if title_el.text is None:
                 title_el = None
 


@@ -168,13 +171,14 @@ class MTVServicesInfoExtractor(InfoExtractor):
             'thumbnail': self._get_thumbnail_url(uri, itemdoc),
             'description': description,
             'duration': float_or_none(content_el.attrib.get('duration')),
             'thumbnail': self._get_thumbnail_url(uri, itemdoc),
             'description': description,
             'duration': float_or_none(content_el.attrib.get('duration')),

+            'timestamp': timestamp,

         }
 
     def _get_feed_query(self, uri):
         data = {'uri': uri}
         if self._LANG:
             data['lang'] = self._LANG
         }
 
     def _get_feed_query(self, uri):
         data = {'uri': uri}
         if self._LANG:
             data['lang'] = self._LANG

-        return compat_urllib_parse.urlencode(data)
+        return compat_urllib_parse_urlencode(data)

 
     def _get_videos_info(self, uri):
         video_id = self._id_from_uri(uri)
 
     def _get_videos_info(self, uri):
         video_id = self._id_from_uri(uri)


@@ -186,8 +190,13 @@ class MTVServicesInfoExtractor(InfoExtractor):
         idoc = self._download_xml(
             url, video_id,
             'Downloading info', transform_source=fix_xml_ampersands)
         idoc = self._download_xml(
             url, video_id,
             'Downloading info', transform_source=fix_xml_ampersands)

+
+        title = xpath_text(idoc, './channel/title')
+        description = xpath_text(idoc, './channel/description')
+

         return self.playlist_result(
         return self.playlist_result(

-            [self._get_video_info(item) for item in idoc.findall('.//item')])
+            [self._get_video_info(item) for item in idoc.findall('.//item')],
+            playlist_title=title, playlist_description=description)

 
     def _extract_mgid(self, webpage):
         try:
 
     def _extract_mgid(self, webpage):
         try:


@@ -233,6 +242,8 @@ class MTVServicesEmbeddedIE(MTVServicesInfoExtractor):
             'ext': 'mp4',
             'title': 'Peter Dinklage Sums Up \'Game Of Thrones\' In 45 Seconds',
             'description': '"Sexy sexy sexy, stabby stabby stabby, beautiful language," says Peter Dinklage as he tries summarizing "Game of Thrones" in under a minute.',
             'ext': 'mp4',
             'title': 'Peter Dinklage Sums Up \'Game Of Thrones\' In 45 Seconds',
             'description': '"Sexy sexy sexy, stabby stabby stabby, beautiful language," says Peter Dinklage as he tries summarizing "Game of Thrones" in under a minute.',

+            'timestamp': 1400126400,
+            'upload_date': '20140515',

         },
     }
 
         },
     }
 


@@ -275,6 +286,8 @@ class MTVIE(MTVServicesInfoExtractor):
                 'ext': 'mp4',
                 'title': 'Taylor Swift - "Ours (VH1 Storytellers)"',
                 'description': 'Album: Taylor Swift performs "Ours" for VH1 Storytellers at Harvey Mudd College.',
                 'ext': 'mp4',
                 'title': 'Taylor Swift - "Ours (VH1 Storytellers)"',
                 'description': 'Album: Taylor Swift performs "Ours" for VH1 Storytellers at Harvey Mudd College.',

+                'timestamp': 1352610000,
+                'upload_date': '20121111',

             },
         },
     ]
             },
         },
     ]


@@ -301,20 +314,6 @@ class MTVIE(MTVServicesInfoExtractor):
         return self._get_videos_info(uri)
 
 
         return self._get_videos_info(uri)
 
 

-class MTVIggyIE(MTVServicesInfoExtractor):
-    IE_NAME = 'mtviggy.com'
-    _VALID_URL = r'https?://www\.mtviggy\.com/videos/.+'
-    _TEST = {
-        'url': 'http://www.mtviggy.com/videos/arcade-fire-behind-the-scenes-at-the-biggest-music-experiment-yet/',
-        'info_dict': {
-            'id': '984696',
-            'ext': 'mp4',
-            'title': 'Arcade Fire: Behind the Scenes at the Biggest Music Experiment Yet',
-        }
-    }
-    _FEED_URL = 'http://all.mtvworldverticals.com/feed-xml/'
-
-

 class MTVDEIE(MTVServicesInfoExtractor):
     IE_NAME = 'mtv.de'
     _VALID_URL = r'https?://(?:www\.)?mtv\.de/(?:artists|shows|news)/(?:[^/]+/)*(?P<id>\d+)-[^/#?]+/*(?:[#?].*)?$'
 class MTVDEIE(MTVServicesInfoExtractor):
     IE_NAME = 'mtv.de'
     _VALID_URL = r'https?://(?:www\.)?mtv\.de/(?:artists|shows|news)/(?:[^/]+/)*(?P<id>\d+)-[^/#?]+/*(?:[#?].*)?$'


@@ -322,7 +321,7 @@ class MTVDEIE(MTVServicesInfoExtractor):
         'url': 'http://www.mtv.de/artists/10571-cro/videos/61131-traum',
         'info_dict': {
             'id': 'music_video-a50bc5f0b3aa4b3190aa',
         'url': 'http://www.mtv.de/artists/10571-cro/videos/61131-traum',
         'info_dict': {
             'id': 'music_video-a50bc5f0b3aa4b3190aa',

-            'ext': 'mp4',
+            'ext': 'flv',

             'title': 'MusicVideo_cro-traum',
             'description': 'Cro - Traum',
         },
             'title': 'MusicVideo_cro-traum',
             'description': 'Cro - Traum',
         },


@@ -330,20 +329,21 @@ class MTVDEIE(MTVServicesInfoExtractor):
             # rtmp download
             'skip_download': True,
         },
             # rtmp download
             'skip_download': True,
         },

+        'skip': 'Blocked at Travis CI',

     }, {
         # mediagen URL without query (e.g. http://videos.mtvnn.com/mediagen/e865da714c166d18d6f80893195fcb97)
         'url': 'http://www.mtv.de/shows/933-teen-mom-2/staffeln/5353/folgen/63565-enthullungen',
         'info_dict': {
             'id': 'local_playlist-f5ae778b9832cc837189',
     }, {
         # mediagen URL without query (e.g. http://videos.mtvnn.com/mediagen/e865da714c166d18d6f80893195fcb97)
         'url': 'http://www.mtv.de/shows/933-teen-mom-2/staffeln/5353/folgen/63565-enthullungen',
         'info_dict': {
             'id': 'local_playlist-f5ae778b9832cc837189',

-            'ext': 'mp4',
+            'ext': 'flv',

             'title': 'Episode_teen-mom-2_shows_season-5_episode-1_full-episode_part1',
         },
         'params': {
             # rtmp download
             'skip_download': True,
         },
             'title': 'Episode_teen-mom-2_shows_season-5_episode-1_full-episode_part1',
         },
         'params': {
             # rtmp download
             'skip_download': True,
         },

+        'skip': 'Blocked at Travis CI',

     }, {
     }, {

-        # single video in pagePlaylist with different id

         'url': 'http://www.mtv.de/news/77491-mtv-movies-spotlight-pixels-teil-3',
         'info_dict': {
             'id': 'local_playlist-4e760566473c4c8c5344',
         'url': 'http://www.mtv.de/news/77491-mtv-movies-spotlight-pixels-teil-3',
         'info_dict': {
             'id': 'local_playlist-4e760566473c4c8c5344',


@@ -355,6 +355,7 @@ class MTVDEIE(MTVServicesInfoExtractor):
             # rtmp download
             'skip_download': True,
         },
             # rtmp download
             'skip_download': True,
         },

+        'skip': 'Das Video kann zur Zeit nicht abgespielt werden.',

     }]
 
     def _real_extract(self, url):
     }]
 
     def _real_extract(self, url):


@@ -367,11 +368,14 @@ class MTVDEIE(MTVServicesInfoExtractor):
                 r'window\.pagePlaylist\s*=\s*(\[.+?\]);\n', webpage, 'page playlist'),
             video_id)
 
                 r'window\.pagePlaylist\s*=\s*(\[.+?\]);\n', webpage, 'page playlist'),
             video_id)
 

+        def _mrss_url(item):
+            return item['mrss'] + item.get('mrssvars', '')
+

         # news pages contain single video in playlist with different id
         if len(playlist) == 1:
         # news pages contain single video in playlist with different id
         if len(playlist) == 1:

-            return self._get_videos_info_from_url(playlist[0]['mrss'], video_id)
+            return self._get_videos_info_from_url(_mrss_url(playlist[0]), video_id)

 
         for item in playlist:
             item_id = item.get('id')
             if item_id and compat_str(item_id) == video_id:
 
         for item in playlist:
             item_id = item.get('id')
             if item_id and compat_str(item_id) == video_id:

-                return self._get_videos_info_from_url(item['mrss'], video_id)
+                return self._get_videos_info_from_url(_mrss_url(item), video_id)