|
|
@ -105,6 +105,7 @@ from .postprocessor import (
|
|
|
|
FFmpegFixupStretchedPP,
|
|
|
|
FFmpegFixupStretchedPP,
|
|
|
|
FFmpegMergerPP,
|
|
|
|
FFmpegMergerPP,
|
|
|
|
FFmpegPostProcessor,
|
|
|
|
FFmpegPostProcessor,
|
|
|
|
|
|
|
|
FFmpegSubtitlesConvertorPP,
|
|
|
|
get_postprocessor,
|
|
|
|
get_postprocessor,
|
|
|
|
)
|
|
|
|
)
|
|
|
|
from .version import __version__
|
|
|
|
from .version import __version__
|
|
|
@ -1846,6 +1847,29 @@ class YoutubeDL(object):
|
|
|
|
(sub_lang, error_to_compat_str(err)))
|
|
|
|
(sub_lang, error_to_compat_str(err)))
|
|
|
|
continue
|
|
|
|
continue
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if self.params.get('skip_download', False):
|
|
|
|
|
|
|
|
if self.params.get('convertsubtitles', False):
|
|
|
|
|
|
|
|
subconv = FFmpegSubtitlesConvertorPP(self, format=self.params.get('convertsubtitles'))
|
|
|
|
|
|
|
|
filename_real_ext = os.path.splitext(filename)[1][1:]
|
|
|
|
|
|
|
|
filename_wo_ext = (
|
|
|
|
|
|
|
|
os.path.splitext(filename)[0]
|
|
|
|
|
|
|
|
if filename_real_ext == info_dict['ext']
|
|
|
|
|
|
|
|
else filename)
|
|
|
|
|
|
|
|
afilename = '%s.%s' % (filename_wo_ext, self.params.get('convertsubtitles'))
|
|
|
|
|
|
|
|
if subconv.available:
|
|
|
|
|
|
|
|
info_dict.setdefault('__postprocessors', [])
|
|
|
|
|
|
|
|
# info_dict['__postprocessors'].append(subconv)
|
|
|
|
|
|
|
|
if os.path.exists(encodeFilename(afilename)):
|
|
|
|
|
|
|
|
self.to_screen(
|
|
|
|
|
|
|
|
'[download] %s has already been downloaded and '
|
|
|
|
|
|
|
|
'converted' % afilename)
|
|
|
|
|
|
|
|
else:
|
|
|
|
|
|
|
|
try:
|
|
|
|
|
|
|
|
self.post_process(filename, info_dict)
|
|
|
|
|
|
|
|
except (PostProcessingError) as err:
|
|
|
|
|
|
|
|
self.report_error('postprocessing: %s' % str(err))
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
|
|
if self.params.get('writeinfojson', False):
|
|
|
|
if self.params.get('writeinfojson', False):
|
|
|
|
infofn = replace_extension(filename, 'info.json', info_dict.get('ext'))
|
|
|
|
infofn = replace_extension(filename, 'info.json', info_dict.get('ext'))
|
|
|
|
if self.params.get('nooverwrites', False) and os.path.exists(encodeFilename(infofn)):
|
|
|
|
if self.params.get('nooverwrites', False) and os.path.exists(encodeFilename(infofn)):
|
|
|
|