projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
release 2013.10.18
[youtube-dl]
/
youtube_dl
/
extractor
/
livestream.py
diff --git
a/youtube_dl/extractor/livestream.py
b/youtube_dl/extractor/livestream.py
index 30992107843d8ff8e6aea6d375e1149ba582d16a..d04da98c89ed582e83e8bb905b15ff04c78d3018 100644
(file)
--- a/
youtube_dl/extractor/livestream.py
+++ b/
youtube_dl/extractor/livestream.py
@@
-2,7
+2,12
@@
import re
import json
from .common import InfoExtractor
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):
class LivestreamIE(InfoExtractor):
@@
-35,8
+40,11
@@
class LivestreamIE(InfoExtractor):
if video_id is None:
# This is an event page:
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'])
info = json.loads(self._download_webpage(api_url, event_name,
u'Downloading event info'))
videos = [self._extract_video_info(video_data['data'])