]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[gdcvault] Fix for videos with hard-coded hostnames
authorYen Chi Hsuan <yan12125@gmail.com>
Thu, 21 Apr 2016 10:07:03 +0000 (18:07 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Thu, 21 Apr 2016 10:07:03 +0000 (18:07 +0800)
Fixes #9248

youtube_dl/extractor/gdcvault.py

index 25e93c9a4369706f830a3db68abe6d31be40ca5f..3ebcaf73393ba75a7adaecc8bd5700e0161ffaab 100644 (file)
@@ -51,18 +51,34 @@ class GDCVaultIE(InfoExtractor):
         {
             'url': 'http://gdcvault.com/play/1020791/',
             'only_matching': True,
-        }
+        },
+        {
+            'url': 'http://gdcvault.com/play/1023460/Tenacious-Design-and-The-Interface',
+            'md5': 'a8efb6c31ed06ca8739294960b2dbabd',
+            'info_dict': {
+                'id': '1023460',
+                'ext': 'mp4',
+                'display_id': 'Tenacious-Design-and-The-Interface',
+                'title': 'Tenacious Design and The Interface of \'Destiny\'',
+            },
+        },
     ]
 
     def _parse_mp4(self, xml_description):
         video_formats = []
+        video_root = None
+
         mp4_video = xml_description.find('./metadata/mp4video')
-        if mp4_video is None:
-            return None
+        if mp4_video is not None:
+            mobj = re.match(r'(?P<root>https?://.*?/).*', mp4_video.text)
+            video_root = mobj.group('root')
+        if video_root is None:
+            # Hard-coded in http://evt.dispeak.com/ubm/gdc/sf16/custom/player2.js
+            video_root = 'http://s3-2u.digitallyspeaking.com/'
 
-        mobj = re.match(r'(?P<root>https?://.*?/).*', mp4_video.text)
-        video_root = mobj.group('root')
         formats = xml_description.findall('./metadata/MBRVideos/MBRVideo')
+        if not formats:
+            return None
         for format in formats:
             mobj = re.match(r'mp4\:(?P<path>.*)', format.find('streamName').text)
             url = video_root + mobj.group('path')