diff options
| author | Sergey M․ <dstftw@gmail.com> | 2015-10-05 22:40:20 +0600 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2015-10-05 22:40:20 +0600 |
| commit | 4853eb63fec766c7154e9353e91e531a3f3b1d1e (patch) | |
| tree | 96658b51bebccd7b3bff825cbad60130a676bc25 | |
| parent | 5820c4a29ea3781c47f6249c179a081e28eeeb64 (diff) | |
[ustream] Modernize
| -rw-r--r-- | youtube_dl/extractor/ustream.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/youtube_dl/extractor/ustream.py b/youtube_dl/extractor/ustream.py index 3065c9f31..9fdeb064d 100644 --- a/youtube_dl/extractor/ustream.py +++ b/youtube_dl/extractor/ustream.py @@ -15,7 +15,7 @@ from ..utils import ( class UstreamIE(InfoExtractor): - _VALID_URL = r'https?://www\.ustream\.tv/(?P<type>recorded|embed|embed/recorded)/(?P<videoID>\d+)' + _VALID_URL = r'https?://www\.ustream\.tv/(?P<type>recorded|embed|embed/recorded)/(?P<id>\d+)' IE_NAME = 'ustream' _TESTS = [{ 'url': 'http://www.ustream.tv/recorded/20274954', @@ -41,22 +41,23 @@ class UstreamIE(InfoExtractor): def _real_extract(self, url): m = re.match(self._VALID_URL, url) - video_id = m.group('videoID') + video_id = m.group('id') # some sites use this embed format (see: http://github.com/rg3/youtube-dl/issues/2990) if m.group('type') == 'embed/recorded': - video_id = m.group('videoID') + video_id = m.group('id') 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') + video_id = m.group('id') 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') - params = self._download_json('https://api.ustream.tv/videos/' + video_id + '.json', video_id) + params = self._download_json( + 'https://api.ustream.tv/videos/%s.json' % video_id, video_id) error = params.get('error') if error: |