diff options
| author | anovicecodemonkey <anovicecodemonkey13435@mailinator.com> | 2014-04-05 00:53:09 +1030 |
|---|---|---|
| committer | anovicecodemonkey <anovicecodemonkey13435@mailinator.com> | 2014-04-05 00:53:09 +1030 |
| commit | 5c38625259cf50dd7432377aac4daee3aede8f25 (patch) | |
| tree | cb1af697094399a45e4239a69758b82e7af84626 /youtube_dl/extractor/generic.py | |
| parent | 6344fa04bbee4dc2336c3ace134cd150fba2f7e6 (diff) | |
| download | youtube-dl-5c38625259cf50dd7432377aac4daee3aede8f25.tar.xz | |
[UstreamIE] [generic] Added support for Ustream embed URLs (Fixes #2694)
Diffstat (limited to 'youtube_dl/extractor/generic.py')
| -rw-r--r-- | youtube_dl/extractor/generic.py | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py index 6a2ce0d6d..6d3e4fb10 100644 --- a/youtube_dl/extractor/generic.py +++ b/youtube_dl/extractor/generic.py @@ -184,6 +184,15 @@ class GenericIE(InfoExtractor): 'description': 'md5:ddb2a40ecd6b6a147e400e535874947b', } }, + # Embeded Ustream video + { + 'url': 'http://www.american.edu/spa/pti/nsa-privacy-janus-2014.cfm', + 'md5': '27b99cdb639c9b12a79bca876a073417', + 'info_dict': { + 'uploader': 'AU SPA: The NSA and Privacy', + 'title': 'NSA and Privacy Forum Debate featuring General Hayden and Barton Gellman' + } + }, # nowvideo embed hidden behind percent encoding { 'url': 'http://www.waoanime.tv/the-super-dimension-fortress-macross-episode-1/', @@ -556,6 +565,12 @@ class GenericIE(InfoExtractor): if mobj is not None: return self.url_result(mobj.group('url'), 'TED') + # Look for embedded Ustream videos + mobj = re.search( + r'<iframe[^>]+?src=(["\'])(?P<url>http://www\.ustream\.tv/embed/.+?)\1', webpage) + if mobj is not None: + return self.url_result(mobj.group('url'), 'Ustream') + # Look for embedded arte.tv player mobj = re.search( r'<script [^>]*?src="(?P<url>http://www\.arte\.tv/playerv2/embed[^"]+)"', |