diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-04-04 23:33:08 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-04-04 23:33:08 +0200 |
| commit | e4d41bfca54ac9ec06b3d2a4c72b8b495ba1eaf3 (patch) | |
| tree | 7c78bf3081348113d0e74f44ca236c47b2d17352 /youtube_dl/extractor/ustream.py | |
| parent | a355b70f271c5eac7e3b0ad3f5381c0757a88e96 (diff) | |
| parent | ca6aada48eec89befbb3f2605b3d83227d893005 (diff) | |
Merge pull request #2696 from anovicecodemonkey/support-ustream-embeds
[UstreamIE] [generic] Added support for Ustream embed URLs (Fixes #2694)
Diffstat (limited to 'youtube_dl/extractor/ustream.py')
| -rw-r--r-- | youtube_dl/extractor/ustream.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/youtube_dl/extractor/ustream.py b/youtube_dl/extractor/ustream.py index 7fa2b9e15..e4bb3b949 100644 --- a/youtube_dl/extractor/ustream.py +++ b/youtube_dl/extractor/ustream.py @@ -11,7 +11,7 @@ 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 = { 'url': 'http://www.ustream.tv/recorded/20274954', @@ -25,6 +25,13 @@ class UstreamIE(InfoExtractor): 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 |