mirror of
https://github.com/ytdl-org/youtube-dl
synced 2025-10-01 22:08:36 +09:00
[YouTube] Fix subtitles extraction
From yt-dlp/yt-dlp#13659, thx bashonly
This commit is contained in:
@@ -2668,7 +2668,12 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
|
|||||||
self.raise_geo_restricted(
|
self.raise_geo_restricted(
|
||||||
subreason, countries)
|
subreason, countries)
|
||||||
reason += '\n' + subreason
|
reason += '\n' + subreason
|
||||||
|
|
||||||
if reason:
|
if reason:
|
||||||
|
if 'sign in' in reason.lower():
|
||||||
|
self.raise_login_required(remove_end(reason, 'This helps protect our community. Learn more'))
|
||||||
|
elif traverse_obj(playability_status, ('errorScreen', 'playerCaptchaViewModel', T(dict))):
|
||||||
|
reason += '. YouTube is requiring a captcha challenge before playback'
|
||||||
raise ExtractorError(reason, expected=True)
|
raise ExtractorError(reason, expected=True)
|
||||||
|
|
||||||
self._sort_formats(formats)
|
self._sort_formats(formats)
|
||||||
@@ -2771,6 +2776,9 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
|
|||||||
for fmt in self._SUBTITLE_FORMATS:
|
for fmt in self._SUBTITLE_FORMATS:
|
||||||
query.update({
|
query.update({
|
||||||
'fmt': fmt,
|
'fmt': fmt,
|
||||||
|
# xosf=1 causes undesirable text position data for vtt, json3 & srv* subtitles
|
||||||
|
# See: https://github.com/yt-dlp/yt-dlp/issues/13654
|
||||||
|
'xosf': []
|
||||||
})
|
})
|
||||||
lang_subs.append({
|
lang_subs.append({
|
||||||
'ext': fmt,
|
'ext': fmt,
|
||||||
|
Reference in New Issue
Block a user