From 1a9a45e5edce7566abc5ab4981e2391fb7401adb Mon Sep 17 00:00:00 2001 From: HaveAGitGat <43864057+HaveAGitGat@users.noreply.github.com> Date: Wed, 8 May 2024 05:42:51 +0100 Subject: [PATCH] Add compiled changes --- .../file/checkFileNameIncludes/1.0.0/index.js | 2 -- .../file/checkFileNameIncludes/2.0.0/index.js | 28 ++++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/FlowPlugins/CommunityFlowPlugins/file/checkFileNameIncludes/1.0.0/index.js b/FlowPlugins/CommunityFlowPlugins/file/checkFileNameIncludes/1.0.0/index.js index 87f44da..271ef8b 100644 --- a/FlowPlugins/CommunityFlowPlugins/file/checkFileNameIncludes/1.0.0/index.js +++ b/FlowPlugins/CommunityFlowPlugins/file/checkFileNameIncludes/1.0.0/index.js @@ -20,12 +20,10 @@ var details = function () { return ({ label: 'Terms', name: 'terms', type: 'string', - // eslint-disable-next-line no-template-curly-in-string defaultValue: '_720p,_1080p', inputUI: { type: 'text', }, - // eslint-disable-next-line no-template-curly-in-string tooltip: 'Specify terms to check for in file name using comma seperated list e.g. _720p,_1080p', }, ], diff --git a/FlowPlugins/CommunityFlowPlugins/file/checkFileNameIncludes/2.0.0/index.js b/FlowPlugins/CommunityFlowPlugins/file/checkFileNameIncludes/2.0.0/index.js index 5a1b11c..8bad238 100644 --- a/FlowPlugins/CommunityFlowPlugins/file/checkFileNameIncludes/2.0.0/index.js +++ b/FlowPlugins/CommunityFlowPlugins/file/checkFileNameIncludes/2.0.0/index.js @@ -20,36 +20,30 @@ var details = function () { return ({ label: 'Terms', name: 'terms', type: 'string', - // eslint-disable-next-line no-template-curly-in-string defaultValue: '_720p,_1080p', inputUI: { type: 'text', }, - // eslint-disable-next-line no-template-curly-in-string tooltip: 'Specify terms to check for in file name using comma seperated list e.g. _720p,_1080p', }, { label: 'Pattern (regular expression)', name: 'pattern', type: 'string', - // eslint-disable-next-line no-template-curly-in-string defaultValue: '', inputUI: { type: 'text', }, - // eslint-disable-next-line no-template-curly-in-string tooltip: 'Specify the pattern (regex) to check for in file name e.g. ^Pattern.*mkv$', }, { label: 'Include file directory in check', name: 'includeFileDirectory', type: 'boolean', - // eslint-disable-next-line no-template-curly-in-string defaultValue: 'false', inputUI: { type: 'switch', }, - // eslint-disable-next-line no-template-curly-in-string tooltip: 'Should the terms and patterns be evaluated against the file directory e.g. false, true', }, ], @@ -70,18 +64,26 @@ var plugin = function (args) { var lib = require('../../../../../methods/lib')(); // eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign args.inputs = lib.loadDefaultValues(args.inputs, details); - var buildArrayInput = function (arrayInput) { var _a, _b; return (_b = (_a = String(arrayInput)) === null || _a === void 0 ? void 0 : _a.trim().split(',')) !== null && _b !== void 0 ? _b : []; }; - var fileName = "".concat((args.inputs.includeFileDirectory ? "".concat((0, fileUtils_1.getFileAbosluteDir)(args.inputFileObj._id), "/") : '') - + (0, fileUtils_1.getFileName)(args.inputFileObj._id), ".").concat((0, fileUtils_1.getContainer)(args.inputFileObj._id)); - var searchCriteriasArray = buildArrayInput(args.inputs.terms) + var terms = String(args.inputs.terms); + var pattern = String(args.inputs.pattern); + var includeFileDirectory = args.inputs.includeFileDirectory; + var fileName = includeFileDirectory + ? args.inputFileObj._id + : "".concat((0, fileUtils_1.getFileName)(args.inputFileObj._id), ".").concat((0, fileUtils_1.getContainer)(args.inputFileObj._id)); + var searchCriteriasArray = terms.trim().split(',') .map(function (term) { return term.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&'); }); // https://github.com/tc39/proposal-regex-escaping - if (args.inputs.pattern) - searchCriteriasArray.push(String(args.inputs.pattern)); + if (pattern) { + searchCriteriasArray.push(pattern); + } var searchCriteriaMatched = searchCriteriasArray .find(function (searchCriteria) { return new RegExp(searchCriteria).test(fileName); }); var isAMatch = searchCriteriaMatched !== undefined; - if (isAMatch) + if (isAMatch) { args.jobLog("'".concat(fileName, "' includes '").concat(searchCriteriaMatched, "'")); + } + else { + args.jobLog("'".concat(fileName, "' does not include any of the terms or patterns")); + } return { outputFileObj: args.inputFileObj, outputNumber: isAMatch ? 1 : 2,