aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2016-04-21 18:07:03 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2016-04-21 18:07:03 +0800
commit99ef96f84c2c9fa1267d6edb836c8f1945295424 (patch)
treed235392d54e5b109cef9ae8f5d4f1bd46a497753
parent4dccea8ad01d51dcdfd4ecc79442bbd30e29871e (diff)
[gdcvault] Fix for videos with hard-coded hostnames
Fixes #9248
-rw-r--r--youtube_dl/extractor/gdcvault.py26
1 files changed, 21 insertions, 5 deletions
diff --git a/youtube_dl/extractor/gdcvault.py b/youtube_dl/extractor/gdcvault.py
index 25e93c9a4..3ebcaf733 100644
--- a/youtube_dl/extractor/gdcvault.py
+++ b/youtube_dl/extractor/gdcvault.py
@@ -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')