diff options
| author | Sergey M․ <dstftw@gmail.com> | 2014-05-29 19:57:42 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2014-05-29 19:57:42 +0700 |
| commit | 8f0c8fb45282caa706c267700f51734bb474fefc (patch) | |
| tree | 511b811bade84634a668c82facc2f10b113779a3 | |
| parent | 950dc95e9749b30b83e9db092e44b8d0d168e830 (diff) | |
| parent | b702ecebf037390f5dee7a72228bc23aa67212e7 (diff) | |
| download | youtube-dl-8f0c8fb45282caa706c267700f51734bb474fefc.tar.gz youtube-dl-8f0c8fb45282caa706c267700f51734bb474fefc.tar.xz youtube-dl-8f0c8fb45282caa706c267700f51734bb474fefc.zip | |
Merge branch 'ustream-embed-recorded2' of https://github.com/anovicecodemonkey/youtube-dl into anovicecodemonkey-ustream-embed-recorded2
| -rw-r--r-- | youtube_dl/extractor/ustream.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/youtube_dl/extractor/ustream.py b/youtube_dl/extractor/ustream.py index e4bb3b949..eb2944573 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/(?P<type>recorded|embed)/(?P<videoID>\d+)' + _VALID_URL = r'https?://www\.ustream\.tv/(?P<type>recorded|embed|embed/recorded)/(?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) + video_id = m.group('videoID') + + if m.group('type') == 'embed/recorded': # some sites use this embed format (see: http://github.com/rg3/youtube-dl/issues/2990) + video_id = m.group('videoID') + webpage = self._download_webpage(url, video_id, note="Downloading embedded Ustream page") + desktop_url = 'http://www.ustream.tv/recorded/' + video_id + return self.url_result(desktop_url, 'Ustream') if m.group('type') == 'embed': video_id = m.group('videoID') webpage = self._download_webpage(url, video_id) @@ -32,8 +39,6 @@ class UstreamIE(InfoExtractor): 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 webpage = self._download_webpage(url, video_id) |