diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-10-31 08:07:26 +0100 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-10-31 08:07:26 +0100 |
| commit | 5f1ea943ab6814c2f8ca2a383f990e3f4c9e5f87 (patch) | |
| tree | 0dc0abd40da545b038ad663b4a1093560a664adc /youtube_dl/extractor | |
| parent | 0ef7ad5cd49d527a24c62e831cf80f2eb443276f (diff) | |
| download | youtube-dl-5f1ea943ab6814c2f8ca2a383f990e3f4c9e5f87.zip youtube-dl-5f1ea943ab6814c2f8ca2a383f990e3f4c9e5f87.tar.gz youtube-dl-5f1ea943ab6814c2f8ca2a383f990e3f4c9e5f87.tar.bz2 | |
[livestream] fix the extraction of events
It now uses a json dictionary from the webpage.
Diffstat (limited to 'youtube_dl/extractor')
| -rw-r--r-- | youtube_dl/extractor/livestream.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/youtube_dl/extractor/livestream.py b/youtube_dl/extractor/livestream.py index d04da98..4531fd6 100644 --- a/youtube_dl/extractor/livestream.py +++ b/youtube_dl/extractor/livestream.py @@ -40,13 +40,9 @@ class LivestreamIE(InfoExtractor): if video_id is None: # This is an event page: - player = get_meta_content('twitter:player', webpage) - if player is None: - raise ExtractorError('Couldn\'t extract event api url') - api_url = player.replace('/player', '') - api_url = re.sub(r'^(https?://)(new\.)', r'\1api.\2', api_url) - info = json.loads(self._download_webpage(api_url, event_name, - u'Downloading event info')) + config_json = self._search_regex(r'window.config = ({.*?});', + webpage, u'window config') + info = json.loads(config_json)['event'] videos = [self._extract_video_info(video_data['data']) for video_data in info['feed']['data'] if video_data['type'] == u'video'] return self.playlist_result(videos, info['id'], info['full_name']) |