From 35121b8015a498b7afb55e793ff444a0d3ffb0fa Mon Sep 17 00:00:00 2001 From: HaveAGitGat <43864057+HaveAGitGat@users.noreply.github.com> Date: Fri, 10 May 2024 07:54:27 +0100 Subject: [PATCH 1/6] Add Run CLI --- .../tools/runCli/1.0.0/index.ts | 127 ++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 FlowPluginsTs/CommunityFlowPlugins/tools/runCli/1.0.0/index.ts diff --git a/FlowPluginsTs/CommunityFlowPlugins/tools/runCli/1.0.0/index.ts b/FlowPluginsTs/CommunityFlowPlugins/tools/runCli/1.0.0/index.ts new file mode 100644 index 0000000..db10b0a --- /dev/null +++ b/FlowPluginsTs/CommunityFlowPlugins/tools/runCli/1.0.0/index.ts @@ -0,0 +1,127 @@ +import { CLI } from '../../../../FlowHelpers/1.0.0/cliUtils'; +import { getContainer, getFileName, getPluginWorkDir } from '../../../../FlowHelpers/1.0.0/fileUtils'; +import { + IpluginDetails, + IpluginInputArgs, + IpluginOutputArgs, +} from '../../../../FlowHelpers/1.0.0/interfaces/interfaces'; + +/* eslint no-plusplus: ["error", { "allowForLoopAfterthoughts": true }] */ +const details = (): IpluginDetails => ({ + name: 'Run CLI', + description: 'Choose a CLI and custom arguments to run', + style: { + borderColor: 'green', + }, + tags: '', + isStartPlugin: false, + pType: '', + requiresVersion: '2.11.01', + sidebarPosition: -1, + icon: '', + inputs: [ + { + label: 'CLI', + name: 'cli', + type: 'string', + defaultValue: 'mkvmerge', + inputUI: { + type: 'dropdown', + options: [ + 'mkvmerge', + 'mkvpropedit', + ], + }, + tooltip: 'CLI to run', + }, + + { + label: 'CLI Arguments', + name: 'cliArguments', + type: 'string', + // eslint-disable-next-line no-template-curly-in-string + defaultValue: '-o "${outputFilePath}" "{{{args.inputFileObj._id}}}"', + inputUI: { + type: 'text', + }, + tooltip: `Specify arguments to pass to the CLI. + Normal variable templating with {{{}}} applies but \${outputFilePath} is a special + variable for an output file in the Tdarr cache directory. + + \\nExample\\n + -o "\${outputFilePath}" "{{{args.inputFileObj._id}}}" + `, + }, + ], + outputs: [ + { + number: 1, + tooltip: 'Continue to next plugin', + }, + ], +}); + +// eslint-disable-next-line @typescript-eslint/no-unused-vars +const plugin = async (args: IpluginInputArgs): Promise => { + const lib = require('../../../../../methods/lib')(); + // eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign + args.inputs = lib.loadDefaultValues(args.inputs, details); + + let selectedCli = String(args.inputs.cli); + let cliArguments = String(args.inputs.cliArguments); + + const outputFilePath = `${getPluginWorkDir(args)}/${getFileName(args.inputFileObj._id)}` + + `.${getContainer(args.inputFileObj._id)}`; + + cliArguments = cliArguments.replace(/\${outputFilePath}/g, outputFilePath); + + const cliArgs = [ + ...args.deps.parseArgsStringToArgv(cliArguments, '', ''), + ]; + + const availableCli:{ + [index: string]: string; + } = { + mkvpropedit: args.mkvpropeditPath, + mkvmerge: 'mkvmerge', + }; + + if (!availableCli[selectedCli]) { + const msg = `CLI ${selectedCli} not available to run in this plugin`; + args.jobLog(msg); + throw new Error(msg); + } + + selectedCli = availableCli[selectedCli]; + + const cli = new CLI({ + cli: selectedCli, + spawnArgs: cliArgs, + spawnOpts: {}, + jobLog: args.jobLog, + outputFilePath, + inputFileObj: args.inputFileObj, + logFullCliOutput: args.logFullCliOutput, + updateWorker: args.updateWorker, + }); + + const res = await cli.runCli(); + + if (res.cliExitCode !== 0) { + const msg = `Running ${selectedCli} failed`; + args.jobLog(msg); + throw new Error(msg); + } + + return { + outputFileObj: { + _id: outputFilePath, + }, + outputNumber: 1, + variables: args.variables, + }; +}; +export { + details, + plugin, +}; From d4c7c92218d05702073d83e729e1accbaa99dfed Mon Sep 17 00:00:00 2001 From: HaveAGitGat Date: Fri, 10 May 2024 06:57:27 +0000 Subject: [PATCH 2/6] Apply auto-build changes --- .../tools/runCli/1.0.0/index.js | 152 ++++++++++++++++++ 1 file changed, 152 insertions(+) create mode 100644 FlowPlugins/CommunityFlowPlugins/tools/runCli/1.0.0/index.js diff --git a/FlowPlugins/CommunityFlowPlugins/tools/runCli/1.0.0/index.js b/FlowPlugins/CommunityFlowPlugins/tools/runCli/1.0.0/index.js new file mode 100644 index 0000000..e2948b5 --- /dev/null +++ b/FlowPlugins/CommunityFlowPlugins/tools/runCli/1.0.0/index.js @@ -0,0 +1,152 @@ +"use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (this && this.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (g && (g = 0, op[0] && (_ = 0)), _) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; +var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) { + if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) { + if (ar || !(i in from)) { + if (!ar) ar = Array.prototype.slice.call(from, 0, i); + ar[i] = from[i]; + } + } + return to.concat(ar || Array.prototype.slice.call(from)); +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.plugin = exports.details = void 0; +var cliUtils_1 = require("../../../../FlowHelpers/1.0.0/cliUtils"); +var fileUtils_1 = require("../../../../FlowHelpers/1.0.0/fileUtils"); +/* eslint no-plusplus: ["error", { "allowForLoopAfterthoughts": true }] */ +var details = function () { return ({ + name: 'Run CLI', + description: 'Choose a CLI and custom arguments to run', + style: { + borderColor: 'green', + }, + tags: '', + isStartPlugin: false, + pType: '', + requiresVersion: '2.11.01', + sidebarPosition: -1, + icon: '', + inputs: [ + { + label: 'CLI', + name: 'cli', + type: 'string', + defaultValue: 'mkvmerge', + inputUI: { + type: 'dropdown', + options: [ + 'mkvmerge', + 'mkvpropedit', + ], + }, + tooltip: 'CLI to run', + }, + { + label: 'CLI Arguments', + name: 'cliArguments', + type: 'string', + // eslint-disable-next-line no-template-curly-in-string + defaultValue: '-o "${outputFilePath}" "{{{args.inputFileObj._id}}}"', + inputUI: { + type: 'text', + }, + tooltip: "Specify arguments to pass to the CLI. \n Normal variable templating with {{{}}} applies but ${outputFilePath} is a special\n variable for an output file in the Tdarr cache directory.\n\n \\nExample\\n\n -o \"${outputFilePath}\" \"{{{args.inputFileObj._id}}}\"\n ", + }, + ], + outputs: [ + { + number: 1, + tooltip: 'Continue to next plugin', + }, + ], +}); }; +exports.details = details; +// eslint-disable-next-line @typescript-eslint/no-unused-vars +var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function () { + var lib, selectedCli, cliArguments, outputFilePath, cliArgs, availableCli, msg, cli, res, msg; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + lib = require('../../../../../methods/lib')(); + // eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign + args.inputs = lib.loadDefaultValues(args.inputs, details); + selectedCli = String(args.inputs.cli); + cliArguments = String(args.inputs.cliArguments); + outputFilePath = "".concat((0, fileUtils_1.getPluginWorkDir)(args), "/").concat((0, fileUtils_1.getFileName)(args.inputFileObj._id)) + + ".".concat((0, fileUtils_1.getContainer)(args.inputFileObj._id)); + cliArguments = cliArguments.replace(/\${outputFilePath}/g, outputFilePath); + cliArgs = __spreadArray([], args.deps.parseArgsStringToArgv(cliArguments, '', ''), true); + availableCli = { + mkvpropedit: args.mkvpropeditPath, + mkvmerge: 'mkvmerge', + }; + if (!availableCli[selectedCli]) { + msg = "CLI ".concat(selectedCli, " not available to run in this plugin"); + args.jobLog(msg); + throw new Error(msg); + } + selectedCli = availableCli[selectedCli]; + cli = new cliUtils_1.CLI({ + cli: selectedCli, + spawnArgs: cliArgs, + spawnOpts: {}, + jobLog: args.jobLog, + outputFilePath: outputFilePath, + inputFileObj: args.inputFileObj, + logFullCliOutput: args.logFullCliOutput, + updateWorker: args.updateWorker, + }); + return [4 /*yield*/, cli.runCli()]; + case 1: + res = _a.sent(); + if (res.cliExitCode !== 0) { + msg = "Running ".concat(selectedCli, " failed"); + args.jobLog(msg); + throw new Error(msg); + } + return [2 /*return*/, { + outputFileObj: { + _id: outputFilePath, + }, + outputNumber: 1, + variables: args.variables, + }]; + } + }); +}); }; +exports.plugin = plugin; From bef48d5c972fc2e4f9a201ee06df60e083507929 Mon Sep 17 00:00:00 2001 From: HaveAGitGat <43864057+HaveAGitGat@users.noreply.github.com> Date: Fri, 10 May 2024 08:45:50 +0100 Subject: [PATCH 3/6] Update logic --- .../tools/runCli/1.0.0/index.ts | 108 ++++++++++++++++-- 1 file changed, 99 insertions(+), 9 deletions(-) diff --git a/FlowPluginsTs/CommunityFlowPlugins/tools/runCli/1.0.0/index.ts b/FlowPluginsTs/CommunityFlowPlugins/tools/runCli/1.0.0/index.ts index db10b0a..1d3455f 100644 --- a/FlowPluginsTs/CommunityFlowPlugins/tools/runCli/1.0.0/index.ts +++ b/FlowPluginsTs/CommunityFlowPlugins/tools/runCli/1.0.0/index.ts @@ -1,5 +1,5 @@ import { CLI } from '../../../../FlowHelpers/1.0.0/cliUtils'; -import { getContainer, getFileName, getPluginWorkDir } from '../../../../FlowHelpers/1.0.0/fileUtils'; +import { getFileName, getPluginWorkDir } from '../../../../FlowHelpers/1.0.0/fileUtils'; import { IpluginDetails, IpluginInputArgs, @@ -34,7 +34,80 @@ const details = (): IpluginDetails => ({ }, tooltip: 'CLI to run', }, + { + label: 'Does Command Create Output File?', + name: 'doesCommandCreateOutputFile', + type: 'boolean', + defaultValue: 'true', + inputUI: { + type: 'switch', + }, + tooltip: + 'Toggle this on if the command creates an output file.', + }, + { + label: 'Output File Path', + name: 'userOutputFilePath', + type: 'string', + // eslint-disable-next-line no-template-curly-in-string + defaultValue: '${cacheDir}/${fileName}.{{{args.inputFileObj.container}}}', + inputUI: { + type: 'text', + displayConditions: { + logic: 'AND', + sets: [ + { + logic: 'AND', + inputs: [ + { + name: 'doesCommandCreateOutputFile', + value: 'true', + condition: '===', + }, + ], + }, + ], + }, + }, + tooltip: ` + This path can be accessed using \${outputFilePath} in the "CLI Arguments" input below. + + \\n + \${cacheDir} is a special variable that points to the Tdarr worker cache directory. + \\n + \${fileName} is a special variable for the filename without extension. + + \\nExample\\n + \${cacheDir}/\${fileName}.{{{args.inputFileObj.container}}} + `, + }, + { + label: 'Output File Becomes Working File?', + name: 'outputFileBecomesWorkingFile', + type: 'boolean', + defaultValue: 'true', + inputUI: { + type: 'switch', + displayConditions: { + logic: 'AND', + sets: [ + { + logic: 'AND', + inputs: [ + { + name: 'doesCommandCreateOutputFile', + value: 'true', + condition: '===', + }, + ], + }, + ], + }, + }, + tooltip: + 'Toggle this on to make the output file become the working file for the next plugin.', + }, { label: 'CLI Arguments', name: 'cliArguments', @@ -46,7 +119,7 @@ const details = (): IpluginDetails => ({ }, tooltip: `Specify arguments to pass to the CLI. Normal variable templating with {{{}}} applies but \${outputFilePath} is a special - variable for an output file in the Tdarr cache directory. + variable from the "Output File Path" input above. \\nExample\\n -o "\${outputFilePath}" "{{{args.inputFileObj._id}}}" @@ -68,12 +141,28 @@ const plugin = async (args: IpluginInputArgs): Promise => { args.inputs = lib.loadDefaultValues(args.inputs, details); let selectedCli = String(args.inputs.cli); + const { + outputFileBecomesWorkingFile, + } = args.inputs; + let userOutputFilePath = String(args.inputs.userOutputFilePath); let cliArguments = String(args.inputs.cliArguments); - const outputFilePath = `${getPluginWorkDir(args)}/${getFileName(args.inputFileObj._id)}` - + `.${getContainer(args.inputFileObj._id)}`; + // eslint-disable-next-line no-template-curly-in-string + if (cliArguments.includes('${outputFilePath}')) { + // eslint-disable-next-line no-template-curly-in-string + if (userOutputFilePath.includes('${cacheDir}')) { + const cacheDir = getPluginWorkDir(args); + userOutputFilePath = userOutputFilePath.replace(/\${cacheDir}/g, cacheDir); + } - cliArguments = cliArguments.replace(/\${outputFilePath}/g, outputFilePath); + // eslint-disable-next-line no-template-curly-in-string + if (userOutputFilePath.includes('${fileName}')) { + const fileName = getFileName(args.inputFileObj._id); + userOutputFilePath = userOutputFilePath.replace(/\${fileName}/g, fileName); + } + + cliArguments = cliArguments.replace(/\${outputFilePath}/g, userOutputFilePath); + } const cliArgs = [ ...args.deps.parseArgsStringToArgv(cliArguments, '', ''), @@ -99,7 +188,7 @@ const plugin = async (args: IpluginInputArgs): Promise => { spawnArgs: cliArgs, spawnOpts: {}, jobLog: args.jobLog, - outputFilePath, + outputFilePath: userOutputFilePath, inputFileObj: args.inputFileObj, logFullCliOutput: args.logFullCliOutput, updateWorker: args.updateWorker, @@ -114,9 +203,10 @@ const plugin = async (args: IpluginInputArgs): Promise => { } return { - outputFileObj: { - _id: outputFilePath, - }, + outputFileObj: outputFileBecomesWorkingFile ? { + _id: userOutputFilePath, + } + : args.inputFileObj, outputNumber: 1, variables: args.variables, }; From 6f03915dfd3404774ce2b17615cbb46db4452e5d Mon Sep 17 00:00:00 2001 From: HaveAGitGat Date: Fri, 10 May 2024 07:48:18 +0000 Subject: [PATCH 4/6] Apply auto-build changes --- .../tools/runCli/1.0.0/index.js | 93 +++++++++++++++++-- 1 file changed, 84 insertions(+), 9 deletions(-) diff --git a/FlowPlugins/CommunityFlowPlugins/tools/runCli/1.0.0/index.js b/FlowPlugins/CommunityFlowPlugins/tools/runCli/1.0.0/index.js index e2948b5..869f939 100644 --- a/FlowPlugins/CommunityFlowPlugins/tools/runCli/1.0.0/index.js +++ b/FlowPlugins/CommunityFlowPlugins/tools/runCli/1.0.0/index.js @@ -76,6 +76,67 @@ var details = function () { return ({ }, tooltip: 'CLI to run', }, + { + label: 'Does Command Create Output File?', + name: 'doesCommandCreateOutputFile', + type: 'boolean', + defaultValue: 'true', + inputUI: { + type: 'switch', + }, + tooltip: 'Toggle this on if the command creates an output file.', + }, + { + label: 'Output File Path', + name: 'userOutputFilePath', + type: 'string', + // eslint-disable-next-line no-template-curly-in-string + defaultValue: '${cacheDir}/${fileName}.{{{args.inputFileObj.container}}}', + inputUI: { + type: 'text', + displayConditions: { + logic: 'AND', + sets: [ + { + logic: 'AND', + inputs: [ + { + name: 'doesCommandCreateOutputFile', + value: 'true', + condition: '===', + }, + ], + }, + ], + }, + }, + tooltip: "\n This path can be accessed using ${outputFilePath} in the \"CLI Arguments\" input below.\n\n \\n\n ${cacheDir} is a special variable that points to the Tdarr worker cache directory.\n\n \\n \n ${fileName} is a special variable for the filename without extension.\n \n \\nExample\\n\n ${cacheDir}/${fileName}.{{{args.inputFileObj.container}}}\n ", + }, + { + label: 'Output File Becomes Working File?', + name: 'outputFileBecomesWorkingFile', + type: 'boolean', + defaultValue: 'true', + inputUI: { + type: 'switch', + displayConditions: { + logic: 'AND', + sets: [ + { + logic: 'AND', + inputs: [ + { + name: 'doesCommandCreateOutputFile', + value: 'true', + condition: '===', + }, + ], + }, + ], + }, + }, + tooltip: 'Toggle this on to make the output file become the working file for the next plugin.', + }, { label: 'CLI Arguments', name: 'cliArguments', @@ -85,7 +146,7 @@ var details = function () { return ({ inputUI: { type: 'text', }, - tooltip: "Specify arguments to pass to the CLI. \n Normal variable templating with {{{}}} applies but ${outputFilePath} is a special\n variable for an output file in the Tdarr cache directory.\n\n \\nExample\\n\n -o \"${outputFilePath}\" \"{{{args.inputFileObj._id}}}\"\n ", + tooltip: "Specify arguments to pass to the CLI. \n Normal variable templating with {{{}}} applies but ${outputFilePath} is a special\n variable from the \"Output File Path\" input above.\n\n \\nExample\\n\n -o \"${outputFilePath}\" \"{{{args.inputFileObj._id}}}\"\n ", }, ], outputs: [ @@ -98,7 +159,7 @@ var details = function () { return ({ exports.details = details; // eslint-disable-next-line @typescript-eslint/no-unused-vars var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function () { - var lib, selectedCli, cliArguments, outputFilePath, cliArgs, availableCli, msg, cli, res, msg; + var lib, selectedCli, outputFileBecomesWorkingFile, userOutputFilePath, cliArguments, cacheDir, fileName, cliArgs, availableCli, msg, cli, res, msg; return __generator(this, function (_a) { switch (_a.label) { case 0: @@ -106,10 +167,23 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function // eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign args.inputs = lib.loadDefaultValues(args.inputs, details); selectedCli = String(args.inputs.cli); + outputFileBecomesWorkingFile = args.inputs.outputFileBecomesWorkingFile; + userOutputFilePath = String(args.inputs.userOutputFilePath); cliArguments = String(args.inputs.cliArguments); - outputFilePath = "".concat((0, fileUtils_1.getPluginWorkDir)(args), "/").concat((0, fileUtils_1.getFileName)(args.inputFileObj._id)) - + ".".concat((0, fileUtils_1.getContainer)(args.inputFileObj._id)); - cliArguments = cliArguments.replace(/\${outputFilePath}/g, outputFilePath); + // eslint-disable-next-line no-template-curly-in-string + if (cliArguments.includes('${outputFilePath}')) { + // eslint-disable-next-line no-template-curly-in-string + if (userOutputFilePath.includes('${cacheDir}')) { + cacheDir = (0, fileUtils_1.getPluginWorkDir)(args); + userOutputFilePath = userOutputFilePath.replace(/\${cacheDir}/g, cacheDir); + } + // eslint-disable-next-line no-template-curly-in-string + if (userOutputFilePath.includes('${fileName}')) { + fileName = (0, fileUtils_1.getFileName)(args.inputFileObj._id); + userOutputFilePath = userOutputFilePath.replace(/\${fileName}/g, fileName); + } + cliArguments = cliArguments.replace(/\${outputFilePath}/g, userOutputFilePath); + } cliArgs = __spreadArray([], args.deps.parseArgsStringToArgv(cliArguments, '', ''), true); availableCli = { mkvpropedit: args.mkvpropeditPath, @@ -126,7 +200,7 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function spawnArgs: cliArgs, spawnOpts: {}, jobLog: args.jobLog, - outputFilePath: outputFilePath, + outputFilePath: userOutputFilePath, inputFileObj: args.inputFileObj, logFullCliOutput: args.logFullCliOutput, updateWorker: args.updateWorker, @@ -140,9 +214,10 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function throw new Error(msg); } return [2 /*return*/, { - outputFileObj: { - _id: outputFilePath, - }, + outputFileObj: outputFileBecomesWorkingFile ? { + _id: userOutputFilePath, + } + : args.inputFileObj, outputNumber: 1, variables: args.variables, }]; From d060e0cbcc163f241c3ab65f61a4c041ab32be5c Mon Sep 17 00:00:00 2001 From: HaveAGitGat <43864057+HaveAGitGat@users.noreply.github.com> Date: Fri, 10 May 2024 08:48:56 +0100 Subject: [PATCH 5/6] Update var to userCli --- .../tools/runCli/1.0.0/index.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/FlowPluginsTs/CommunityFlowPlugins/tools/runCli/1.0.0/index.ts b/FlowPluginsTs/CommunityFlowPlugins/tools/runCli/1.0.0/index.ts index 1d3455f..9fbc7fc 100644 --- a/FlowPluginsTs/CommunityFlowPlugins/tools/runCli/1.0.0/index.ts +++ b/FlowPluginsTs/CommunityFlowPlugins/tools/runCli/1.0.0/index.ts @@ -22,7 +22,7 @@ const details = (): IpluginDetails => ({ inputs: [ { label: 'CLI', - name: 'cli', + name: 'userCli', type: 'string', defaultValue: 'mkvmerge', inputUI: { @@ -140,7 +140,7 @@ const plugin = async (args: IpluginInputArgs): Promise => { // eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign args.inputs = lib.loadDefaultValues(args.inputs, details); - let selectedCli = String(args.inputs.cli); + let userCli = String(args.inputs.userCli); const { outputFileBecomesWorkingFile, } = args.inputs; @@ -175,16 +175,16 @@ const plugin = async (args: IpluginInputArgs): Promise => { mkvmerge: 'mkvmerge', }; - if (!availableCli[selectedCli]) { - const msg = `CLI ${selectedCli} not available to run in this plugin`; + if (!availableCli[userCli]) { + const msg = `CLI ${userCli} not available to run in this plugin`; args.jobLog(msg); throw new Error(msg); } - selectedCli = availableCli[selectedCli]; + userCli = availableCli[userCli]; const cli = new CLI({ - cli: selectedCli, + cli: userCli, spawnArgs: cliArgs, spawnOpts: {}, jobLog: args.jobLog, @@ -197,7 +197,7 @@ const plugin = async (args: IpluginInputArgs): Promise => { const res = await cli.runCli(); if (res.cliExitCode !== 0) { - const msg = `Running ${selectedCli} failed`; + const msg = `Running ${userCli} failed`; args.jobLog(msg); throw new Error(msg); } From e51f96dee8778897f9cd351638c6a4671e255cf0 Mon Sep 17 00:00:00 2001 From: HaveAGitGat Date: Fri, 10 May 2024 07:51:38 +0000 Subject: [PATCH 6/6] Apply auto-build changes --- .../tools/runCli/1.0.0/index.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/FlowPlugins/CommunityFlowPlugins/tools/runCli/1.0.0/index.js b/FlowPlugins/CommunityFlowPlugins/tools/runCli/1.0.0/index.js index 869f939..412e89f 100644 --- a/FlowPlugins/CommunityFlowPlugins/tools/runCli/1.0.0/index.js +++ b/FlowPlugins/CommunityFlowPlugins/tools/runCli/1.0.0/index.js @@ -64,7 +64,7 @@ var details = function () { return ({ inputs: [ { label: 'CLI', - name: 'cli', + name: 'userCli', type: 'string', defaultValue: 'mkvmerge', inputUI: { @@ -159,14 +159,14 @@ var details = function () { return ({ exports.details = details; // eslint-disable-next-line @typescript-eslint/no-unused-vars var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function () { - var lib, selectedCli, outputFileBecomesWorkingFile, userOutputFilePath, cliArguments, cacheDir, fileName, cliArgs, availableCli, msg, cli, res, msg; + var lib, userCli, outputFileBecomesWorkingFile, userOutputFilePath, cliArguments, cacheDir, fileName, cliArgs, availableCli, msg, cli, res, msg; return __generator(this, function (_a) { switch (_a.label) { case 0: lib = require('../../../../../methods/lib')(); // eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign args.inputs = lib.loadDefaultValues(args.inputs, details); - selectedCli = String(args.inputs.cli); + userCli = String(args.inputs.userCli); outputFileBecomesWorkingFile = args.inputs.outputFileBecomesWorkingFile; userOutputFilePath = String(args.inputs.userOutputFilePath); cliArguments = String(args.inputs.cliArguments); @@ -189,14 +189,14 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function mkvpropedit: args.mkvpropeditPath, mkvmerge: 'mkvmerge', }; - if (!availableCli[selectedCli]) { - msg = "CLI ".concat(selectedCli, " not available to run in this plugin"); + if (!availableCli[userCli]) { + msg = "CLI ".concat(userCli, " not available to run in this plugin"); args.jobLog(msg); throw new Error(msg); } - selectedCli = availableCli[selectedCli]; + userCli = availableCli[userCli]; cli = new cliUtils_1.CLI({ - cli: selectedCli, + cli: userCli, spawnArgs: cliArgs, spawnOpts: {}, jobLog: args.jobLog, @@ -209,7 +209,7 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function case 1: res = _a.sent(); if (res.cliExitCode !== 0) { - msg = "Running ".concat(selectedCli, " failed"); + msg = "Running ".concat(userCli, " failed"); args.jobLog(msg); throw new Error(msg); }