dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[vlive] Address site update 

Changes:
* Fix video params extraction
* Don't make status request since status info now available on the page
* Remove unneeded code
* Fix test
This commit is contained in:
Kagami Hiiragi 2016-05-24 12:13:05 +03:00
parent a4760d204f
commit 25bcd3550e
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
youtube_dl/extractor/vlive.py
View File

@ -1,8 +1,7 @@
# coding: utf-8 # coding: utf-8
from __future__ import division, unicode_literals from __future__ import unicode_literals
import re import re
import time
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
@ -23,7 +22,7 @@ class VLiveIE(InfoExtractor):
'info_dict': { 'info_dict': {
'id': '1326', 'id': '1326',
'ext': 'mp4', 'ext': 'mp4',
'title': "[V] Girl's Day's Broadcast", 'title': "[V LIVE] Girl's Day's Broadcast",
'creator': "Girl's Day", 'creator': "Girl's Day",
'view_count': int, 'view_count': int,
}, },
@ -35,24 +34,11 @@ class VLiveIE(InfoExtractor):
webpage = self._download_webpage( webpage = self._download_webpage(
'http://www.vlive.tv/video/%s' % video_id, video_id) '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( video_params = self._search_regex(
r'vlive\.tv\.video\.ajax\.request\.handler\.init\((.+)\)', r'\bvlive\.video\.init\(([^)]+)\)',
webpage, 'video params') webpage, 'video params')
live_params, long_video_id, key = re.split( status, _, _, live_params, long_video_id, key = re.split(
r'"\s*,\s*"', video_params)[1:4] r'"\s*,\s*"', video_params)[2:8]
if status == 'LIVE_ON_AIR' or status == 'BIG_EVENT_ON_AIR': if status == 'LIVE_ON_AIR' or status == 'BIG_EVENT_ON_AIR':
live_params = self._parse_json('"%s"' % live_params, video_id) 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': elif status == 'VOD_ON_AIR' or status == 'BIG_EVENT_INTRO':
if long_video_id and key: if long_video_id and key:
return self._replay(video_id, webpage, long_video_id, key) return self._replay(video_id, webpage, long_video_id, key)
elif is_live:
status = 'LIVE_END'
else: else:
status = 'COMING_SOON' status = 'COMING_SOON'
@ -70,7 +54,7 @@ class VLiveIE(InfoExtractor):
raise ExtractorError('Uploading for replay. Please wait...', raise ExtractorError('Uploading for replay. Please wait...',
expected=True) expected=True)
elif status == 'COMING_SOON': elif status == 'COMING_SOON':
raise ExtractorError('Coming soon! %s' % air_start, expected=True) raise ExtractorError('Coming soon!', expected=True)
elif status == 'CANCELED': elif status == 'CANCELED':
raise ExtractorError('We are sorry, ' raise ExtractorError('We are sorry, '
'but the live broadcast has been canceled.', 'but the live broadcast has been canceled.',