Merge branch 'main' of gitea.maveno.de:Javanaut/ffx

This commit is contained in:
2023-10-24 14:08:04 +02:00

View File

@@ -187,16 +187,15 @@ for quality in qualities:
commandSequence = commandTokens + mappingTokens + generateAV1Tokens(quality, preset) + audioTokens commandSequence = commandTokens + mappingTokens + generateAV1Tokens(quality, preset) + audioTokens
if cropStart:
commandSequence += generateCropTokens(cropStart, cropLength)
if len(qualities) > 1: if len(qualities) > 1:
commandSequence += generateOutputTokens(outputFilename, quality) commandSequence += generateOutputTokens(outputFilename, quality)
else: else:
commandSequence += generateOutputTokens(outputFilename) commandSequence += generateOutputTokens(outputFilename)
if cropStart: print(f"Command: {' '.join(commandSequence)}")
commandSequence += generateCropTokens(cropStart, cropLength)
print(f"Command Sequence: {commandSequence}")
executeProcess(commandSequence) executeProcess(commandSequence)
@@ -212,7 +211,7 @@ for quality in qualities:
commandSequence1 += nullTokens commandSequence1 += nullTokens
print(f"Command Sequence 1: {commandSequence1}") print(f"Command 1: {' '.join(commandSequence1)}")
if os.path.exists(TEMP_FILE_NAME): if os.path.exists(TEMP_FILE_NAME):
os.remove(TEMP_FILE_NAME) os.remove(TEMP_FILE_NAME)
@@ -232,7 +231,7 @@ for quality in qualities:
commandSequence2 += generateOutputTokens(outputFilename) commandSequence2 += generateOutputTokens(outputFilename)
print(f"Command Sequence 2: {commandSequence2}") print(f"Command 2: {' '.join(commandSequence2)}")
executeProcess(commandSequence2) executeProcess(commandSequence2)