Merge tag 'upstream/2016.02.22'

[youtubedl] / youtube_dl / extractor / gdcvault.py

diff --git a/youtube_dl/extractor/gdcvault.py b/youtube_dl/extractor/gdcvault.py
index de14ae1fb1edd0600488b8f04c7b400bf310ef5a..3befd3e7b8f9ffeb48a31a284b5971b3a8a5cfab 100644 (file)
--- a/youtube_dl/extractor/gdcvault.py
+++ b/youtube_dl/extractor/gdcvault.py
@@ -3,20 +3,24 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
 import re
 
 from .common import InfoExtractor

+from ..compat import compat_urllib_parse

 from ..utils import (
 from ..utils import (

-    compat_urllib_parse,
-    compat_urllib_request,
+    remove_end,
+    HEADRequest,
+    sanitized_Request,

 )
 
 
 class GDCVaultIE(InfoExtractor):
 )
 
 
 class GDCVaultIE(InfoExtractor):

-    _VALID_URL = r'https?://(?:www\.)?gdcvault\.com/play/(?P<id>\d+)/(?P<name>(\w|-)+)'
+    _VALID_URL = r'https?://(?:www\.)?gdcvault\.com/play/(?P<id>\d+)/(?P<name>(\w|-)+)?'
+    _NETRC_MACHINE = 'gdcvault'

     _TESTS = [
         {
             'url': 'http://www.gdcvault.com/play/1019721/Doki-Doki-Universe-Sweet-Simple',
             'md5': '7ce8388f544c88b7ac11c7ab1b593704',
             'info_dict': {
                 'id': '1019721',
     _TESTS = [
         {
             'url': 'http://www.gdcvault.com/play/1019721/Doki-Doki-Universe-Sweet-Simple',
             'md5': '7ce8388f544c88b7ac11c7ab1b593704',
             'info_dict': {
                 'id': '1019721',

+                'display_id': 'Doki-Doki-Universe-Sweet-Simple',

                 'ext': 'mp4',
                 'title': 'Doki-Doki Universe: Sweet, Simple and Genuine (GDC Next 10)'
             }
                 'ext': 'mp4',
                 'title': 'Doki-Doki Universe: Sweet, Simple and Genuine (GDC Next 10)'
             }


@@ -25,6 +29,7 @@ class GDCVaultIE(InfoExtractor):
             'url': 'http://www.gdcvault.com/play/1015683/Embracing-the-Dark-Art-of',
             'info_dict': {
                 'id': '1015683',
             'url': 'http://www.gdcvault.com/play/1015683/Embracing-the-Dark-Art-of',
             'info_dict': {
                 'id': '1015683',

+                'display_id': 'Embracing-the-Dark-Art-of',

                 'ext': 'flv',
                 'title': 'Embracing the Dark Art of Mathematical Modeling in AI'
             },
                 'ext': 'flv',
                 'title': 'Embracing the Dark Art of Mathematical Modeling in AI'
             },


@@ -37,9 +42,15 @@ class GDCVaultIE(InfoExtractor):
             'md5': 'a5eb77996ef82118afbbe8e48731b98e',
             'info_dict': {
                 'id': '1015301',
             'md5': 'a5eb77996ef82118afbbe8e48731b98e',
             'info_dict': {
                 'id': '1015301',

+                'display_id': 'Thexder-Meets-Windows-95-or',

                 'ext': 'flv',
                 'title': 'Thexder Meets Windows 95, or Writing Great Games in the Windows 95 Environment',
                 'ext': 'flv',
                 'title': 'Thexder Meets Windows 95, or Writing Great Games in the Windows 95 Environment',

-            }
+            },
+            'skip': 'Requires login',
+        },
+        {
+            'url': 'http://gdcvault.com/play/1020791/',
+            'only_matching': True,

         }
     ]
 
         }
     ]
 


@@ -63,27 +74,41 @@ class GDCVaultIE(InfoExtractor):
         return video_formats
 
     def _parse_flv(self, xml_description):
         return video_formats
 
     def _parse_flv(self, xml_description):

-        video_formats = []
-        akami_url = xml_description.find('./metadata/akamaiHost').text
+        formats = []
+        akamai_url = xml_description.find('./metadata/akamaiHost').text
+        audios = xml_description.find('./metadata/audios')
+        if audios is not None:
+            for audio in audios:
+                formats.append({
+                    'url': 'rtmp://%s/ondemand?ovpfv=1.1' % akamai_url,
+                    'play_path': remove_end(audio.get('url'), '.flv'),
+                    'ext': 'flv',
+                    'vcodec': 'none',
+                    'format_id': audio.get('code'),
+                })

         slide_video_path = xml_description.find('./metadata/slideVideo').text
         slide_video_path = xml_description.find('./metadata/slideVideo').text

-        video_formats.append({
-            'url': 'rtmp://' + akami_url + '/' + slide_video_path,
+        formats.append({
+            'url': 'rtmp://%s/ondemand?ovpfv=1.1' % akamai_url,
+            'play_path': remove_end(slide_video_path, '.flv'),
+            'ext': 'flv',

             'format_note': 'slide deck video',
             'quality': -2,
             'preference': -2,
             'format_id': 'slides',
         })
         speaker_video_path = xml_description.find('./metadata/speakerVideo').text
             'format_note': 'slide deck video',
             'quality': -2,
             'preference': -2,
             'format_id': 'slides',
         })
         speaker_video_path = xml_description.find('./metadata/speakerVideo').text

-        video_formats.append({
-            'url': 'rtmp://' + akami_url + '/' + speaker_video_path,
+        formats.append({
+            'url': 'rtmp://%s/ondemand?ovpfv=1.1' % akamai_url,
+            'play_path': remove_end(speaker_video_path, '.flv'),
+            'ext': 'flv',

             'format_note': 'speaker video',
             'quality': -1,
             'preference': -1,
             'format_id': 'speaker',
         })
             'format_note': 'speaker video',
             'quality': -1,
             'preference': -1,
             'format_id': 'speaker',
         })

-        return video_formats
+        return formats

 
 

-    def _login(self, webpage_url, video_id):
+    def _login(self, webpage_url, display_id):

         (username, password) = self._get_login_info()
         if username is None or password is None:
             self.report_warning('It looks like ' + webpage_url + ' requires a login. Try specifying a username and password and try again.')
         (username, password) = self._get_login_info()
         if username is None or password is None:
             self.report_warning('It looks like ' + webpage_url + ' requires a login. Try specifying a username and password and try again.')


@@ -98,11 +123,11 @@ class GDCVaultIE(InfoExtractor):
             'password': password,
         }
 
             'password': password,
         }
 

-        request = compat_urllib_request.Request(login_url, compat_urllib_parse.urlencode(login_form))
+        request = sanitized_Request(login_url, compat_urllib_parse.urlencode(login_form))

         request.add_header('Content-Type', 'application/x-www-form-urlencoded')
         request.add_header('Content-Type', 'application/x-www-form-urlencoded')

-        self._download_webpage(request, video_id, 'Logging in')
-        start_page = self._download_webpage(webpage_url, video_id, 'Getting authenticated video page')
-        self._download_webpage(logout_url, video_id, 'Logging out')
+        self._download_webpage(request, display_id, 'Logging in')
+        start_page = self._download_webpage(webpage_url, display_id, 'Getting authenticated video page')
+        self._download_webpage(logout_url, display_id, 'Logging out')

 
         return start_page
 
 
         return start_page
 


@@ -110,22 +135,27 @@ class GDCVaultIE(InfoExtractor):
         mobj = re.match(self._VALID_URL, url)
 
         video_id = mobj.group('id')
         mobj = re.match(self._VALID_URL, url)
 
         video_id = mobj.group('id')

+        display_id = mobj.group('name') or video_id
+

         webpage_url = 'http://www.gdcvault.com/play/' + video_id
         webpage_url = 'http://www.gdcvault.com/play/' + video_id

-        start_page = self._download_webpage(webpage_url, video_id)
+        start_page = self._download_webpage(webpage_url, display_id)

 
         direct_url = self._search_regex(
             r's1\.addVariable\("file",\s*encodeURIComponent\("(/[^"]+)"\)\);',
             start_page, 'url', default=None)
         if direct_url:
 
         direct_url = self._search_regex(
             r's1\.addVariable\("file",\s*encodeURIComponent\("(/[^"]+)"\)\);',
             start_page, 'url', default=None)
         if direct_url:

-            video_url = 'http://www.gdcvault.com/' + direct_url

             title = self._html_search_regex(
                 r'<td><strong>Session Name</strong></td>\s*<td>(.*?)</td>',
                 start_page, 'title')
             title = self._html_search_regex(
                 r'<td><strong>Session Name</strong></td>\s*<td>(.*?)</td>',
                 start_page, 'title')

+            video_url = 'http://www.gdcvault.com' + direct_url
+            # resolve the url so that we can detect the correct extension
+            head = self._request_webpage(HEADRequest(video_url), video_id)
+            video_url = head.geturl()

 
             return {
                 'id': video_id,
 
             return {
                 'id': video_id,

+                'display_id': display_id,

                 'url': video_url,
                 'url': video_url,

-                'ext': 'flv',

                 'title': title,
             }
 
                 'title': title,
             }
 


@@ -134,7 +164,7 @@ class GDCVaultIE(InfoExtractor):
             start_page, 'xml root', default=None)
         if xml_root is None:
             # Probably need to authenticate
             start_page, 'xml root', default=None)
         if xml_root is None:
             # Probably need to authenticate

-            login_res = self._login(webpage_url, video_id)
+            login_res = self._login(webpage_url, display_id)

             if login_res is None:
                 self.report_warning('Could not login.')
             else:
             if login_res is None:
                 self.report_warning('Could not login.')
             else:


@@ -151,8 +181,8 @@ class GDCVaultIE(InfoExtractor):
             # Fallback to the older format
             xml_name = self._html_search_regex(r'<iframe src=".*?\?xmlURL=xml/(?P<xml_file>.+?\.xml).*?".*?</iframe>', start_page, 'xml filename')
 
             # Fallback to the older format
             xml_name = self._html_search_regex(r'<iframe src=".*?\?xmlURL=xml/(?P<xml_file>.+?\.xml).*?".*?</iframe>', start_page, 'xml filename')
 

-        xml_decription_url = xml_root + 'xml/' + xml_name
-        xml_description = self._download_xml(xml_decription_url, video_id)
+        xml_description_url = xml_root + 'xml/' + xml_name
+        xml_description = self._download_xml(xml_description_url, display_id)

 
         video_title = xml_description.find('./metadata/title').text
         video_formats = self._parse_mp4(xml_description)
 
         video_title = xml_description.find('./metadata/title').text
         video_formats = self._parse_mp4(xml_description)


@@ -161,6 +191,7 @@ class GDCVaultIE(InfoExtractor):
 
         return {
             'id': video_id,
 
         return {
             'id': video_id,

+            'display_id': display_id,

             'title': video_title,
             'formats': video_formats,
         }
             'title': video_title,
             'formats': video_formats,
         }