mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-27 06:10:12 +01:00
- Applied try_look to festival videos
- Removed redundant calls to `_download_playinfo`
This commit is contained in:
parent
e187799c58
commit
29a5968278
|
@ -645,8 +645,7 @@ def _real_extract(self, url):
|
||||||
raise ExtractorError(
|
raise ExtractorError(
|
||||||
'This video may be deleted or geo-restricted. '
|
'This video may be deleted or geo-restricted. '
|
||||||
'You might want to try a VPN or a proxy server (with --proxy)', expected=True)
|
'You might want to try a VPN or a proxy server (with --proxy)', expected=True)
|
||||||
play_info = traverse_obj(play_info_obj, ('data', {dict}))
|
if not traverse_obj(play_info_obj, ('data', {dict})):
|
||||||
if not play_info:
|
|
||||||
if traverse_obj(play_info_obj, 'code') == 87007:
|
if traverse_obj(play_info_obj, 'code') == 87007:
|
||||||
toast = get_element_by_class('tips-toast', webpage) or ''
|
toast = get_element_by_class('tips-toast', webpage) or ''
|
||||||
msg = clean_html(
|
msg = clean_html(
|
||||||
|
@ -681,11 +680,10 @@ def _real_extract(self, url):
|
||||||
aid = video_data.get('aid')
|
aid = video_data.get('aid')
|
||||||
old_video_id = format_field(aid, None, f'%s_part{part_id or 1}')
|
old_video_id = format_field(aid, None, f'%s_part{part_id or 1}')
|
||||||
cid = traverse_obj(video_data, ('pages', part_id - 1, 'cid')) if part_id else video_data.get('cid')
|
cid = traverse_obj(video_data, ('pages', part_id - 1, 'cid')) if part_id else video_data.get('cid')
|
||||||
|
play_info = self._download_playinfo(video_id, cid, headers=headers, try_look=1)
|
||||||
|
|
||||||
festival_info = {}
|
festival_info = {}
|
||||||
if is_festival:
|
if is_festival:
|
||||||
play_info = self._download_playinfo(video_id, cid, headers=headers)
|
|
||||||
|
|
||||||
festival_info = traverse_obj(initial_state, {
|
festival_info = traverse_obj(initial_state, {
|
||||||
'uploader': ('videoInfo', 'upName'),
|
'uploader': ('videoInfo', 'upName'),
|
||||||
'uploader_id': ('videoInfo', 'upMid', {str_or_none}),
|
'uploader_id': ('videoInfo', 'upMid', {str_or_none}),
|
||||||
|
@ -721,7 +719,6 @@ def _real_extract(self, url):
|
||||||
duration=traverse_obj(initial_state, ('videoData', 'duration', {int_or_none})),
|
duration=traverse_obj(initial_state, ('videoData', 'duration', {int_or_none})),
|
||||||
__post_extractor=self.extract_comments(aid))
|
__post_extractor=self.extract_comments(aid))
|
||||||
else:
|
else:
|
||||||
play_info = self._download_playinfo(video_id, cid, headers=headers, try_look=1)
|
|
||||||
formats = self.extract_formats(play_info)
|
formats = self.extract_formats(play_info)
|
||||||
|
|
||||||
if not traverse_obj(play_info, ('dash')):
|
if not traverse_obj(play_info, ('dash')):
|
||||||
|
|
Loading…
Reference in New Issue
Block a user