|
|
@ -1856,12 +1856,14 @@ class YoutubeDL(object):
|
|
|
|
# subtitles download errors are already managed as troubles in relevant IE
|
|
|
|
# subtitles download errors are already managed as troubles in relevant IE
|
|
|
|
# that way it will silently go on when used with unsupporting IE
|
|
|
|
# that way it will silently go on when used with unsupporting IE
|
|
|
|
subtitles = info_dict['requested_subtitles']
|
|
|
|
subtitles = info_dict['requested_subtitles']
|
|
|
|
|
|
|
|
ie = self.get_info_extractor(info_dict['extractor_key'])
|
|
|
|
for sub_lang, sub_info in subtitles.items():
|
|
|
|
for sub_lang, sub_info in subtitles.items():
|
|
|
|
sub_format = sub_info['ext']
|
|
|
|
sub_format = sub_info['ext']
|
|
|
|
sub_filename = subtitles_filename(filename, sub_lang, sub_format, info_dict.get('ext'))
|
|
|
|
sub_filename = subtitles_filename(filename, sub_lang, sub_format, info_dict.get('ext'))
|
|
|
|
if self.params.get('nooverwrites', False) and os.path.exists(encodeFilename(sub_filename)):
|
|
|
|
if self.params.get('nooverwrites', False) and os.path.exists(encodeFilename(sub_filename)):
|
|
|
|
self.to_screen('[info] Video subtitle %s.%s is already present' % (sub_lang, sub_format))
|
|
|
|
self.to_screen('[info] Video subtitle %s.%s is already present' % (sub_lang, sub_format))
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
|
|
|
|
self.to_screen('[info] Writing video subtitles to: ' + sub_filename)
|
|
|
|
if sub_info.get('data') is not None:
|
|
|
|
if sub_info.get('data') is not None:
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
# Use newline='' to prevent conversion of newline characters
|
|
|
|
# Use newline='' to prevent conversion of newline characters
|
|
|
@ -1873,11 +1875,14 @@ class YoutubeDL(object):
|
|
|
|
return
|
|
|
|
return
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
dl(sub_filename, sub_info)
|
|
|
|
if self.params.get('sleep_interval_subtitles', False):
|
|
|
|
except (ExtractorError, IOError, OSError, ValueError,
|
|
|
|
dl(sub_filename, sub_info)
|
|
|
|
compat_urllib_error.URLError,
|
|
|
|
else:
|
|
|
|
compat_http_client.HTTPException,
|
|
|
|
sub_data = ie._request_webpage(
|
|
|
|
socket.error) as err:
|
|
|
|
sub_info['url'], info_dict['id'], note=False).read()
|
|
|
|
|
|
|
|
with io.open(encodeFilename(sub_filename), 'wb') as subfile:
|
|
|
|
|
|
|
|
subfile.write(sub_data)
|
|
|
|
|
|
|
|
except (ExtractorError, IOError, OSError, ValueError, compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
|
|
|
|
self.report_warning('Unable to download subtitle for "%s": %s' %
|
|
|
|
self.report_warning('Unable to download subtitle for "%s": %s' %
|
|
|
|
(sub_lang, error_to_compat_str(err)))
|
|
|
|
(sub_lang, error_to_compat_str(err)))
|
|
|
|
continue
|
|
|
|
continue
|
|
|
|