Skip fixup of existing files and add `--fixup force` to force it

This commit is contained in:
pukkandan 2021-06-20 04:15:19 +05:30
parent fd7cfb6444
commit f89b3e2d7a
No known key found for this signature in database
GPG Key ID: 0F00D95A001F4698
3 changed files with 8 additions and 4 deletions

View File

@ -2690,7 +2690,10 @@ class YoutubeDL(object):
return
elif fixup_policy == 'warn':
do_fixup = False
assert fixup_policy in ('detect_or_warn', None)
elif fixup_policy != 'force':
assert fixup_policy in ('detect_or_warn', None)
if not info_dict.get('__real_download'):
do_fixup = False
def ffmpeg_fixup(cndn, msg, cls):
if not cndn:

View File

@ -1230,11 +1230,12 @@ def parseOpts(overrideArguments=None):
postproc.add_option(
'--fixup',
metavar='POLICY', dest='fixup', default=None,
choices=('never', 'ignore', 'warn', 'detect_or_warn'),
choices=('never', 'ignore', 'warn', 'detect_or_warn', 'force'),
help=(
'Automatically correct known faults of the file. '
'One of never (do nothing), warn (only emit a warning), '
'detect_or_warn (the default; fix file if we can, warn otherwise)'))
'detect_or_warn (the default; fix file if we can, warn otherwise), '
'force (try fixing even if file already exists'))
postproc.add_option(
'--prefer-avconv', '--no-prefer-ffmpeg',
action='store_false', dest='prefer_ffmpeg',

View File

@ -665,7 +665,7 @@ class FFmpegFixupPostProcessor(FFmpegPostProcessor):
def _fixup(self, msg, filename, options):
temp_filename = prepend_extension(filename, 'temp')
self.to_screen('{msg} of "{filename}"')
self.to_screen(f'{msg} of "{filename}"')
self.run_ffmpeg(filename, temp_filename, options)
os.remove(encodeFilename(filename))