depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-31 13:17:40 +00:00
Code Issues Releases Wiki Activity

[ustream] Fix /embed/ URLs and add a test

Browse source
This commit is contained in:
Yen Chi Hsuan 2016-04-16 19:39:25 +08:00
parent bec47a0748
commit 67d46a3f90
No known key found for this signature in database
GPG key ID: 3FDDD575826C5C30
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
youtube_dl/extractor/ustream.py
View file

@ -41,6 +41,12 @@ class UstreamIE(InfoExtractor):
'uploader': 'sportscanadatv', 'uploader': 'sportscanadatv',
}, },
'skip': 'This Pro Broadcaster has chosen to remove this video from the ustream.tv site.', 'skip': 'This Pro Broadcaster has chosen to remove this video from the ustream.tv site.',
}, {
'url': 'http://www.ustream.tv/embed/10299409',
'info_dict': {
'id': '10299409',
},
'playlist_count': 3,
}] }]
def _real_extract(self, url): def _real_extract(self, url):
@ -55,10 +61,12 @@ class UstreamIE(InfoExtractor):
if m.group('type') == 'embed': if m.group('type') == 'embed':
video_id = m.group('id') video_id = m.group('id')
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
desktop_video_id = self._html_search_regex( content_video_ids = self._parse_json(self._search_regex(
r'ContentVideoIds=\["([^"]*?)"\]', webpage, 'desktop_video_id') r'ustream\.vars\.offAirContentVideoIds=([^;]+);', webpage,
desktop_url = 'http://www.ustream.tv/recorded/' + desktop_video_id 'content video IDs'), video_id)
return self.url_result(desktop_url, 'Ustream') return self.playlist_result(
map(lambda u: self.url_result('http://www.ustream.tv/recorded/' + u, 'Ustream'), content_video_ids),
video_id)
params = self._download_json( params = self._download_json(
'https://api.ustream.tv/videos/%s.json' % video_id, video_id) 'https://api.ustream.tv/videos/%s.json' % video_id, video_id)