diff options
| -rw-r--r-- | youtube_dl/extractor/dispeak.py | 29 | ||||
| -rw-r--r-- | youtube_dl/extractor/gdcvault.py | 14 |
2 files changed, 30 insertions, 13 deletions
diff --git a/youtube_dl/extractor/dispeak.py b/youtube_dl/extractor/dispeak.py index 6ebc3255a..c74fa7e07 100644 --- a/youtube_dl/extractor/dispeak.py +++ b/youtube_dl/extractor/dispeak.py @@ -13,9 +13,9 @@ from ..utils import ( class DigitalSpeakingIE(InfoExtractor): - _VALID_URL = r'http://evt.dispeak.com/([^/]+/)+xml/(?P<id>[^.]+).xml' + _VALID_URL = r'http://(?:evt\.dispeak|events\.digitallyspeaking)\.com/([^/]+/)+xml/(?P<id>[^.]+).xml' - _TEST = { + _TESTS = [{ # From http://evt.dispeak.com/ubm/gdc/sf16/xml/840376_BQRC.xml 'url': 'http://evt.dispeak.com/ubm/gdc/sf16/xml/840376_BQRC.xml', 'md5': 'a8efb6c31ed06ca8739294960b2dbabd', @@ -24,7 +24,11 @@ class DigitalSpeakingIE(InfoExtractor): 'ext': 'mp4', 'title': 'Tenacious Design and The Interface of \'Destiny\'', }, - } + }, { + # From http://www.gdcvault.com/play/1014631/Classic-Game-Postmortem-PAC + 'url': 'http://events.digitallyspeaking.com/gdc/sf11/xml/12396_1299111843500GMPX.xml', + 'only_matching': True, + }] def _parse_mp4(self, metadata): video_formats = [] @@ -60,16 +64,15 @@ class DigitalSpeakingIE(InfoExtractor): def _parse_flv(self, metadata): formats = [] akamai_url = xpath_text(metadata, './akamaiHost', fatal=True) - audios = metadata.find('./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'), - }) + audios = metadata.findall('./audios/audio') + 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 = xpath_text(metadata, './slideVideo', fatal=True) formats.append({ 'url': 'rtmp://%s/ondemand?ovpfv=1.1' % akamai_url, diff --git a/youtube_dl/extractor/gdcvault.py b/youtube_dl/extractor/gdcvault.py index 01e1ceec8..5d45faf85 100644 --- a/youtube_dl/extractor/gdcvault.py +++ b/youtube_dl/extractor/gdcvault.py @@ -52,6 +52,7 @@ class GDCVaultIE(InfoExtractor): 'only_matching': True, }, { + # Hard-coded hostname 'url': 'http://gdcvault.com/play/1023460/Tenacious-Design-and-The-Interface', 'md5': 'a8efb6c31ed06ca8739294960b2dbabd', 'info_dict': { @@ -61,6 +62,19 @@ class GDCVaultIE(InfoExtractor): 'title': 'Tenacious Design and The Interface of \'Destiny\'', }, }, + { + # Multiple audios + 'url': 'http://www.gdcvault.com/play/1014631/Classic-Game-Postmortem-PAC', + 'info_dict': { + 'id': '1014631', + 'ext': 'flv', + 'title': 'How to Create a Good Game - From My Experience of Designing Pac-Man', + }, + 'params': { + 'skip_download': True, # Requires rtmpdump + 'format': 'jp', # The japanese audio + } + }, ] def _login(self, webpage_url, display_id): |