Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

shouldProcess if overallOuputArguments #494

Merged
merged 1 commit into from
Oct 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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;
Expand Down Expand Up @@ -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*/, {
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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 {
Expand All @@ -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}`;

Expand Down