Merge pull request #494 from HaveAGitGat/changes

shouldProcess if overallOuputArguments
HaveAGitGat · Oct 5, 2023 · 7d09d20 · 7d09d20
2 parents bb3b40b + 65809d4
commit 7d09d20
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/FlowPlugins/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandExecute/1.0.0/index.js b/FlowPlugins/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandExecute/1.0.0/index.js
@@ -96,7 +96,7 @@ var getOuputStreamTypeIndex = function (streams, stream) {
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var lib, cliArgs, inputArgs, _a, shouldProcess, streams, _loop_1, i, idx, outputFilePath, cli, res;
+    var lib, cliArgs, _a, shouldProcess, streams, inputArgs, _loop_1, i, idx, outputFilePath, cli, res;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
@@ -107,8 +107,11 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function
                 cliArgs.push('-y');
                 cliArgs.push('-i');
                 cliArgs.push(args.inputFileObj._id);
-                inputArgs = __spreadArray([], args.variables.ffmpegCommand.overallInputArguments, true);
                 _a = args.variables.ffmpegCommand, shouldProcess = _a.shouldProcess, streams = _a.streams;
+                if (args.variables.ffmpegCommand.overallInputArguments.length > 0) {
+                    shouldProcess = true;
+                }
+                inputArgs = __spreadArray([], args.variables.ffmpegCommand.overallInputArguments, true);
                 streams = streams.filter(function (stream) {
                     if (stream.removed) {
                         shouldProcess = true;
@@ -140,6 +143,12 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function
                 for (i = 0; i < streams.length; i += 1) {
                     _loop_1(i);
                 }
+                idx = cliArgs.indexOf('-i');
+                cliArgs.splice.apply(cliArgs, __spreadArray([idx, 0], inputArgs, false));
+                if (args.variables.ffmpegCommand.overallOuputArguments.length > 0) {
+                    cliArgs.push.apply(cliArgs, args.variables.ffmpegCommand.overallOuputArguments);
+                    shouldProcess = true;
+                }
                 if (!shouldProcess) {
                     args.jobLog('No need to process file, already as required');
                     return [2 /*return*/, {
@@ -148,9 +157,6 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function
                             variables: args.variables,
                         }];
                 }
-                idx = cliArgs.indexOf('-i');
-                cliArgs.splice.apply(cliArgs, __spreadArray([idx, 0], inputArgs, false));
-                cliArgs.push.apply(cliArgs, args.variables.ffmpegCommand.overallOuputArguments);
                 outputFilePath = "".concat((0, fileUtils_1.getPluginWorkDir)(args), "/").concat((0, fileUtils_1.getFileName)(args.inputFileObj._id))
                     + ".".concat(args.variables.ffmpegCommand.container);
                 cliArgs.push(outputFilePath);

diff --git a/FlowPluginsTs/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandExecute/1.0.0/index.ts b/FlowPluginsTs/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandExecute/1.0.0/index.ts
@@ -74,10 +74,15 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
   cliArgs.push('-i');
   cliArgs.push(args.inputFileObj._id);
 
+  let { shouldProcess, streams } = args.variables.ffmpegCommand;
+
+  if (args.variables.ffmpegCommand.overallInputArguments.length > 0) {
+    shouldProcess = true;
+  }
+
   const inputArgs: string[] = [
     ...args.variables.ffmpegCommand.overallInputArguments,
   ];
-  let { shouldProcess, streams } = args.variables.ffmpegCommand;
 
   streams = streams.filter((stream) => {
     if (stream.removed) {
@@ -114,6 +119,14 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
     inputArgs.push(...stream.inputArgs);
   }
 
+  const idx = cliArgs.indexOf('-i');
+  cliArgs.splice(idx, 0, ...inputArgs);
+
+  if (args.variables.ffmpegCommand.overallOuputArguments.length > 0) {
+    cliArgs.push(...args.variables.ffmpegCommand.overallOuputArguments);
+    shouldProcess = true;
+  }
+
   if (!shouldProcess) {
     args.jobLog('No need to process file, already as required');
     return {
@@ -123,10 +136,6 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
     };
   }
 
-  const idx = cliArgs.indexOf('-i');
-  cliArgs.splice(idx, 0, ...inputArgs);
-  cliArgs.push(...args.variables.ffmpegCommand.overallOuputArguments);
-
   const outputFilePath = `${getPluginWorkDir(args)}/${getFileName(args.inputFileObj._id)}`
   + `.${args.variables.ffmpegCommand.container}`;