Mirrors
/
yt-dlp
mirror of https://github.com/yt-dlp/yt-dlp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[youtube:comments] Fix error handling and add `itct` to params (#446) 

Should close #439 (untested)

Authored by: colethedj
This commit is contained in:
coletdjnz 2021-06-26 06:01:10 +12:00 committed by GitHub
parent 49c258e18d
commit 45261e063b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
yt_dlp/extractor/youtube.py
View File

@ -1731,6 +1731,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
'pbj': 1, 'pbj': 1,
'type': 'next', 'type': 'next',
} }
if 'itct' in continuation:
query['itct'] = continuation['itct']
if parent: if parent:
query['action_get_comment_replies'] = 1 query['action_get_comment_replies'] = 1
else: else:
@ -1776,19 +1778,27 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
response = try_get(browse, response = try_get(browse,
(lambda x: x['response'], (lambda x: x['response'],
lambda x: x[1]['response'])) or {} lambda x: x[1]['response']), dict) or {}
if response.get('continuationContents'): if response.get('continuationContents'):
break break
# YouTube sometimes gives reload: now json if something went wrong (e.g. bad auth) # YouTube sometimes gives reload: now json if something went wrong (e.g. bad auth)
if isinstance(browse, dict):
if browse.get('reload'): if browse.get('reload'):
raise ExtractorError('Invalid or missing params in continuation request', expected=False) raise ExtractorError('Invalid or missing params in continuation request', expected=False)
# TODO: not tested, merged from old extractor # TODO: not tested, merged from old extractor
err_msg = browse.get('externalErrorMessage') err_msg = browse.get('externalErrorMessage')
if err_msg: if err_msg:
raise ExtractorError('YouTube said: %s' % err_msg, expected=False) last_error = err_msg
continue
response_error = try_get(response, lambda x: x['responseContext']['errors']['error'][0], dict) or {}
err_msg = response_error.get('externalErrorMessage')
if err_msg:
last_error = err_msg
continue
# Youtube sometimes sends incomplete data # Youtube sometimes sends incomplete data
# See: https://github.com/ytdl-org/youtube-dl/issues/28194 # See: https://github.com/ytdl-org/youtube-dl/issues/28194