aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/vlive.py28
1 files changed, 6 insertions, 22 deletions
diff --git a/youtube_dl/extractor/vlive.py b/youtube_dl/extractor/vlive.py
index a672ea9c5..147f52d45 100644
--- a/youtube_dl/extractor/vlive.py
+++ b/youtube_dl/extractor/vlive.py
@@ -1,8 +1,7 @@
# coding: utf-8
-from __future__ import division, unicode_literals
+from __future__ import unicode_literals
import re
-import time
from .common import InfoExtractor
from ..utils import (
@@ -23,7 +22,7 @@ class VLiveIE(InfoExtractor):
'info_dict': {
'id': '1326',
'ext': 'mp4',
- 'title': "[V] Girl's Day's Broadcast",
+ 'title': "[V LIVE] Girl's Day's Broadcast",
'creator': "Girl's Day",
'view_count': int,
},
@@ -35,24 +34,11 @@ class VLiveIE(InfoExtractor):
webpage = self._download_webpage(
'http://www.vlive.tv/video/%s' % video_id, video_id)
- # UTC+x - UTC+9 (KST)
- tz = time.altzone if time.localtime().tm_isdst == 1 else time.timezone
- tz_offset = -tz // 60 - 9 * 60
- self._set_cookie('vlive.tv', 'timezoneOffset', '%d' % tz_offset)
-
- status_params = self._download_json(
- 'http://www.vlive.tv/video/status?videoSeq=%s' % video_id,
- video_id, 'Downloading JSON status',
- headers={'Referer': url.encode('utf-8')})
- status = status_params.get('status')
- air_start = status_params.get('onAirStartAt', '')
- is_live = status_params.get('isLive')
-
video_params = self._search_regex(
- r'vlive\.tv\.video\.ajax\.request\.handler\.init\((.+)\)',
+ r'\bvlive\.video\.init\(([^)]+)\)',
webpage, 'video params')
- live_params, long_video_id, key = re.split(
- r'"\s*,\s*"', video_params)[1:4]
+ status, _, _, live_params, long_video_id, key = re.split(
+ r'"\s*,\s*"', video_params)[2:8]
if status == 'LIVE_ON_AIR' or status == 'BIG_EVENT_ON_AIR':
live_params = self._parse_json('"%s"' % live_params, video_id)
@@ -61,8 +47,6 @@ class VLiveIE(InfoExtractor):
elif status == 'VOD_ON_AIR' or status == 'BIG_EVENT_INTRO':
if long_video_id and key:
return self._replay(video_id, webpage, long_video_id, key)
- elif is_live:
- status = 'LIVE_END'
else:
status = 'COMING_SOON'
@@ -70,7 +54,7 @@ class VLiveIE(InfoExtractor):
raise ExtractorError('Uploading for replay. Please wait...',
expected=True)
elif status == 'COMING_SOON':
- raise ExtractorError('Coming soon! %s' % air_start, expected=True)
+ raise ExtractorError('Coming soon!', expected=True)
elif status == 'CANCELED':
raise ExtractorError('We are sorry, '
'but the live broadcast has been canceled.',