mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-10 00:58:17 +02:00
[vlive] fix: raise login required error on vlive+
This commit is contained in:
parent
73cc1b9125
commit
130599af94
@ -120,8 +120,15 @@ def _real_extract(self, url):
|
|||||||
params = self._parse_json(params, working_id, fatal=False)
|
params = self._parse_json(params, working_id, fatal=False)
|
||||||
|
|
||||||
video_params = try_get(params, lambda x: x["postDetail"]["post"]["officialVideo"])
|
video_params = try_get(params, lambda x: x["postDetail"]["post"]["officialVideo"])
|
||||||
|
|
||||||
if video_params is None:
|
if video_params is None:
|
||||||
if 'post' in url:
|
error_data = try_get(params, lambda x: x["postDetail"]["error"]["data"])
|
||||||
|
product_type = try_get(error_data,
|
||||||
|
[lambda x: x["officialVideo"]["productType"],
|
||||||
|
lambda x: x["board"]["boardType"]])
|
||||||
|
if product_type in ('VLIVE_PLUS', 'VLIVE+'):
|
||||||
|
self.raise_login_required('This video is only available for VLIVE+ subscribers')
|
||||||
|
elif 'post' in url:
|
||||||
raise ExtractorError('Url does not appear to be a video post.')
|
raise ExtractorError('Url does not appear to be a video post.')
|
||||||
else:
|
else:
|
||||||
raise ExtractorError('Failed to extract video parameters.')
|
raise ExtractorError('Failed to extract video parameters.')
|
||||||
@ -191,17 +198,6 @@ def _replay(self, video_id, webpage, params, video_params):
|
|||||||
key = key_json["inkey"]
|
key = key_json["inkey"]
|
||||||
long_video_id = video_params["vodId"]
|
long_video_id = video_params["vodId"]
|
||||||
|
|
||||||
if '' in (long_video_id, key):
|
|
||||||
init_page = self._download_init_page(video_id)
|
|
||||||
video_info = self._parse_json(self._search_regex(
|
|
||||||
(r'(?s)oVideoStatus\s*=\s*({.+?})\s*</script',
|
|
||||||
r'(?s)oVideoStatus\s*=\s*({.+})'), init_page, 'video info'),
|
|
||||||
video_id)
|
|
||||||
if video_info.get('status') == 'NEED_CHANNEL_PLUS':
|
|
||||||
self.raise_login_required(
|
|
||||||
'This video is only available for CH+ subscribers')
|
|
||||||
long_video_id, key = video_info['vid'], video_info['inkey']
|
|
||||||
|
|
||||||
return merge_dicts(
|
return merge_dicts(
|
||||||
self._get_common_fields(webpage, params),
|
self._get_common_fields(webpage, params),
|
||||||
self._extract_video_info(video_id, long_video_id, key))
|
self._extract_video_info(video_id, long_video_id, key))
|
||||||
|
Loading…
Reference in New Issue
Block a user