aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/ustream.py
diff options
context:
space:
mode:
Diffstat (limited to 'youtube_dl/extractor/ustream.py')
-rw-r--r--youtube_dl/extractor/ustream.py21
1 files changed, 19 insertions, 2 deletions
diff --git a/youtube_dl/extractor/ustream.py b/youtube_dl/extractor/ustream.py
index 7fa2b9e15..d1d2af19b 100644
--- a/youtube_dl/extractor/ustream.py
+++ b/youtube_dl/extractor/ustream.py
@@ -11,9 +11,9 @@ from ..utils import (
class UstreamIE(InfoExtractor):
- _VALID_URL = r'https?://www\.ustream\.tv/recorded/(?P<videoID>\d+)'
+ _VALID_URL = r'https?://www\.ustream\.tv/(?P<type>recorded|embed)/(?P<videoID>\d+)'
IE_NAME = 'ustream'
- _TEST = {
+ _TESTS = [{
'url': 'http://www.ustream.tv/recorded/20274954',
'file': '20274954.flv',
'md5': '088f151799e8f572f84eb62f17d73e5c',
@@ -21,10 +21,27 @@ class UstreamIE(InfoExtractor):
"uploader": "Young Americans for Liberty",
"title": "Young Americans for Liberty February 7, 2012 2:28 AM",
},
+ },
+ {
+ 'url': 'http://www.ustream.tv/embed/17357891',
+ 'file': 'NSA and Privacy Forum Debate featuring General Hayden and Barton Gellman-45734260.flv',
+ 'md5': '27b99cdb639c9b12a79bca876a073417',
+ 'info_dict': {
+ "uploader": "AU SPA: The NSA and Privacy",
+ "title": "NSA and Privacy Forum Debate featuring General Hayden and Barton Gellman"
+ },
}
+ ]
def _real_extract(self, url):
m = re.match(self._VALID_URL, url)
+ if m.group('type') == 'embed':
+ video_id = m.group('videoID')
+ webpage = self._download_webpage(url, video_id)
+ desktop_video_id = self._html_search_regex(r'ContentVideoIds=\["([^"]*?)"\]', webpage, 'desktop_video_id')
+ desktop_url = 'http://www.ustream.tv/recorded/' + desktop_video_id
+ return self.url_result(desktop_url, 'Ustream')
+
video_id = m.group('videoID')
video_url = 'http://tcdn.ustream.tv/video/%s' % video_id