diff options
author | rzhxeo <rzhxeo@users.noreply.github.com> | 2013-09-30 21:39:58 -0700 |
---|---|---|
committer | rzhxeo <rzhxeo@users.noreply.github.com> | 2013-09-30 21:39:58 -0700 |
commit | c0de39e6d42d8de6a77768b2a96570fd8df8ad36 (patch) | |
tree | ef10e4ee36c43121490ae5bf89275c1793a30f88 /youtube_dl/extractor/livestream.py | |
parent | a921f40799d2ecb4be53b3241d2dbfc80f804d73 (diff) | |
parent | 722076a123c60ed6d5a978c4bc2609f46c8e3ee9 (diff) |
Merge pull request #2 from rg3/master
Update
Diffstat (limited to 'youtube_dl/extractor/livestream.py')
-rw-r--r-- | youtube_dl/extractor/livestream.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/youtube_dl/extractor/livestream.py b/youtube_dl/extractor/livestream.py index 309921078..d04da98c8 100644 --- a/youtube_dl/extractor/livestream.py +++ b/youtube_dl/extractor/livestream.py @@ -2,7 +2,12 @@ import re import json from .common import InfoExtractor -from ..utils import compat_urllib_parse_urlparse, compat_urlparse +from ..utils import ( + compat_urllib_parse_urlparse, + compat_urlparse, + get_meta_content, + ExtractorError, +) class LivestreamIE(InfoExtractor): @@ -35,8 +40,11 @@ class LivestreamIE(InfoExtractor): if video_id is None: # This is an event page: - api_url = self._search_regex(r'event_design_eventId: \'(.+?)\'', - webpage, 'api url') + 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')) videos = [self._extract_video_info(video_data['data']) |