From 88d9d154964b5db2b2c2ba45c3338bb99c9ded9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tronel?= Date: Fri, 15 Dec 2023 09:38:47 +0100 Subject: [PATCH] If we only try to convert from .ts to .mp4 or .mkv, without any cut, do not remove output file. --- removeads.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/removeads.py b/removeads.py index fcc5702..6bdac8c 100755 --- a/removeads.py +++ b/removeads.py @@ -891,6 +891,7 @@ def main(): exit(-1) prevts = ts2 + nbParts = len(parts) temporaries = [] basename = os.path.splitext(os.path.basename(args.inputFile))[0] @@ -935,7 +936,8 @@ def main(): logger.error('') ffmpegConvert(paths['ffmpeg'], mp4, 'mp4', mkv, 'matroska', duration) - temporaries.append(mkv) + if nbParts > 0: + temporaries.append(mkv) except IOError: logger.error('') @@ -946,7 +948,8 @@ def main(): except IOError: logger.error('') ffmpegConvert(paths['ffmpeg'], mp4, 'mp4', mkv, 'matroska', duration) - temporaries.append(mkv) + if nbParts > 0: + temporaries.append(mkv) else: logger.info("Already in MKV") mkv = inputFile @@ -1036,11 +1039,11 @@ def main(): # We need to check the end also checks.append(pos) - nbParts = len(mkvparts) - if nbParts > 1: + nbMKVParts = len(mkvparts) + if nbMKVParts > 1: logger.info('Merging: %s' % mkvparts) mergeMKVs(inputs=mkvparts, outputName=args.outputFile) - elif nbParts == 1: + elif nbMKVParts == 1: copyfile('part-1.mkv', args.outputFile) else: logger.info("Nothing else to do.")