mirror of
https://github.com/gabehf/Tdarr_Plugins.git
synced 2026-03-14 09:45:55 -07:00
Replaced custom code by array.prototype.find
This commit is contained in:
parent
9a02d4b344
commit
c04dba1453
2 changed files with 9 additions and 16 deletions
|
|
@ -71,20 +71,17 @@ var plugin = function (args) {
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign
|
||||||
args.inputs = lib.loadDefaultValues(args.inputs, details);
|
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 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 isAMatch = false;
|
|
||||||
var fileName = "".concat((args.inputs.includeFileDirectory ? "".concat((0, fileUtils_1.getFileAbosluteDir)(args.inputFileObj._id), "/") : '')
|
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));
|
+ (0, fileUtils_1.getFileName)(args.inputFileObj._id), ".").concat((0, fileUtils_1.getContainer)(args.inputFileObj._id));
|
||||||
var searchCriteriasArray = buildArrayInput(args.inputs.terms)
|
var searchCriteriasArray = buildArrayInput(args.inputs.terms)
|
||||||
.map(function (term) { return term.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&'); }); // https://github.com/tc39/proposal-regex-escaping
|
.map(function (term) { return term.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&'); }); // https://github.com/tc39/proposal-regex-escaping
|
||||||
if (args.inputs.pattern)
|
if (args.inputs.pattern)
|
||||||
searchCriteriasArray.push(String(args.inputs.pattern));
|
searchCriteriasArray.push(String(args.inputs.pattern));
|
||||||
for (var i = 0; i < searchCriteriasArray.length; i++) {
|
var searchCriteriaMatched = searchCriteriasArray
|
||||||
if (new RegExp(searchCriteriasArray[i]).test(fileName)) {
|
.find(function (searchCriteria) { return new RegExp(searchCriteria).test(fileName); });
|
||||||
isAMatch = true;
|
var isAMatch = searchCriteriaMatched !== undefined;
|
||||||
args.jobLog("'".concat(fileName, "' includes '").concat(searchCriteriasArray[i], "'"));
|
if (isAMatch)
|
||||||
break;
|
args.jobLog("'".concat(fileName, "' includes '").concat(searchCriteriaMatched, "'"));
|
||||||
}
|
|
||||||
}
|
|
||||||
return {
|
return {
|
||||||
outputFileObj: args.inputFileObj,
|
outputFileObj: args.inputFileObj,
|
||||||
outputNumber: isAMatch ? 1 : 2,
|
outputNumber: isAMatch ? 1 : 2,
|
||||||
|
|
|
||||||
|
|
@ -76,7 +76,6 @@ const plugin = (args: IpluginInputArgs): IpluginOutputArgs => {
|
||||||
|
|
||||||
const buildArrayInput = (arrayInput: unknown): string[] => String(arrayInput)?.trim().split(',') ?? [];
|
const buildArrayInput = (arrayInput: unknown): string[] => String(arrayInput)?.trim().split(',') ?? [];
|
||||||
|
|
||||||
let isAMatch = false;
|
|
||||||
const fileName = `${(args.inputs.includeFileDirectory ? `${getFileAbosluteDir(args.inputFileObj._id)}/` : '')
|
const fileName = `${(args.inputs.includeFileDirectory ? `${getFileAbosluteDir(args.inputFileObj._id)}/` : '')
|
||||||
+ getFileName(args.inputFileObj._id)
|
+ getFileName(args.inputFileObj._id)
|
||||||
}.${getContainer(args.inputFileObj._id)}`;
|
}.${getContainer(args.inputFileObj._id)}`;
|
||||||
|
|
@ -84,13 +83,10 @@ const plugin = (args: IpluginInputArgs): IpluginOutputArgs => {
|
||||||
.map((term) => term.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&')); // https://github.com/tc39/proposal-regex-escaping
|
.map((term) => term.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&')); // https://github.com/tc39/proposal-regex-escaping
|
||||||
if (args.inputs.pattern) searchCriteriasArray.push(String(args.inputs.pattern));
|
if (args.inputs.pattern) searchCriteriasArray.push(String(args.inputs.pattern));
|
||||||
|
|
||||||
for (let i = 0; i < searchCriteriasArray.length; i++) {
|
const searchCriteriaMatched = searchCriteriasArray
|
||||||
if (new RegExp(searchCriteriasArray[i]).test(fileName)) {
|
.find((searchCriteria) => new RegExp(searchCriteria).test(fileName));
|
||||||
isAMatch = true;
|
const isAMatch = searchCriteriaMatched !== undefined;
|
||||||
args.jobLog(`'${fileName}' includes '${searchCriteriasArray[i]}'`);
|
if (isAMatch) args.jobLog(`'${fileName}' includes '${searchCriteriaMatched}'`);
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
outputFileObj: args.inputFileObj,
|
outputFileObj: args.inputFileObj,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue