If we only try to convert from .ts to .mp4 or .mkv, without any cut, do not remove output file.
This commit is contained in:
13
removeads.py
13
removeads.py
@@ -891,6 +891,7 @@ def main():
|
|||||||
exit(-1)
|
exit(-1)
|
||||||
prevts = ts2
|
prevts = ts2
|
||||||
|
|
||||||
|
nbParts = len(parts)
|
||||||
temporaries = []
|
temporaries = []
|
||||||
|
|
||||||
basename = os.path.splitext(os.path.basename(args.inputFile))[0]
|
basename = os.path.splitext(os.path.basename(args.inputFile))[0]
|
||||||
@@ -935,7 +936,8 @@ def main():
|
|||||||
logger.error('')
|
logger.error('')
|
||||||
|
|
||||||
ffmpegConvert(paths['ffmpeg'], mp4, 'mp4', mkv, 'matroska', duration)
|
ffmpegConvert(paths['ffmpeg'], mp4, 'mp4', mkv, 'matroska', duration)
|
||||||
temporaries.append(mkv)
|
if nbParts > 0:
|
||||||
|
temporaries.append(mkv)
|
||||||
except IOError:
|
except IOError:
|
||||||
logger.error('')
|
logger.error('')
|
||||||
|
|
||||||
@@ -946,7 +948,8 @@ def main():
|
|||||||
except IOError:
|
except IOError:
|
||||||
logger.error('')
|
logger.error('')
|
||||||
ffmpegConvert(paths['ffmpeg'], mp4, 'mp4', mkv, 'matroska', duration)
|
ffmpegConvert(paths['ffmpeg'], mp4, 'mp4', mkv, 'matroska', duration)
|
||||||
temporaries.append(mkv)
|
if nbParts > 0:
|
||||||
|
temporaries.append(mkv)
|
||||||
else:
|
else:
|
||||||
logger.info("Already in MKV")
|
logger.info("Already in MKV")
|
||||||
mkv = inputFile
|
mkv = inputFile
|
||||||
@@ -1036,11 +1039,11 @@ def main():
|
|||||||
# We need to check the end also
|
# We need to check the end also
|
||||||
checks.append(pos)
|
checks.append(pos)
|
||||||
|
|
||||||
nbParts = len(mkvparts)
|
nbMKVParts = len(mkvparts)
|
||||||
if nbParts > 1:
|
if nbMKVParts > 1:
|
||||||
logger.info('Merging: %s' % mkvparts)
|
logger.info('Merging: %s' % mkvparts)
|
||||||
mergeMKVs(inputs=mkvparts, outputName=args.outputFile)
|
mergeMKVs(inputs=mkvparts, outputName=args.outputFile)
|
||||||
elif nbParts == 1:
|
elif nbMKVParts == 1:
|
||||||
copyfile('part-1.mkv', args.outputFile)
|
copyfile('part-1.mkv', args.outputFile)
|
||||||
else:
|
else:
|
||||||
logger.info("Nothing else to do.")
|
logger.info("Nothing else to do.")
|
||||||
|
|||||||
Reference in New Issue
Block a user