gabehf/Tdarr_Plugins
1
0
Fork 0
mirror of https://github.com/gabehf/Tdarr_Plugins.git synced 2026-03-09 07:29:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #661 from HaveAGitGat/tags_fix

Browse source 
Trim and filter tags
This commit is contained in:
HaveAGitGat 2024-06-10 13:54:53 +01:00 • committed by GitHub
commit 6d6ff0bb88
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
FlowPlugins/CommunityFlowPlugins/tools/tagsWorkerType/1.0.0/index.js
View file

@ -68,7 +68,7 @@ var plugin = function (args) {
var currentTags = [];
requiredTags.push("require".concat(requiredWorkerType));
if (requiredNodeTags) {
requiredTags = requiredTags.concat(requiredNodeTags.split(',').map(function (tag) { return tag.trim(); }));
requiredTags = requiredTags.concat(requiredNodeTags.split(','));
}
var currentWorkerType = args.workerType;
if (requiredWorkerType === 'CPUorGPU') {
@ -86,8 +86,10 @@ var plugin = function (args) {
}
}
if (args.nodeTags) {
currentTags = currentTags.concat(args.nodeTags.split(',').map(function (tag) { return tag.trim(); }));
currentTags = currentTags.concat(args.nodeTags.split(','));
}
requiredTags = requiredTags.map(function (tag) { return tag.trim(); }).filter(function (tag) { return tag !== ''; });
currentTags = currentTags.map(function (tag) { return tag.trim(); }).filter(function (tag) { return tag !== ''; });
args.jobLog("Required Tags: ".concat(requiredTags.join(',')));
args.jobLog("Current Tags: ".concat(currentTags.join(',')));
var isSubset = true;

7
FlowPluginsTs/CommunityFlowPlugins/tools/tagsWorkerType/1.0.0/index.ts
View file

@ -84,7 +84,7 @@ const plugin = (args: IpluginInputArgs): IpluginOutputArgs => {
requiredTags.push(`require${requiredWorkerType}`);
if (requiredNodeTags) {
requiredTags = requiredTags.concat(requiredNodeTags.split(',').map((tag) => tag.trim()));
requiredTags = requiredTags.concat(requiredNodeTags.split(','));
}
const currentWorkerType = args.workerType;
@ -102,9 +102,12 @@ const plugin = (args: IpluginInputArgs): IpluginOutputArgs => {
}
if (args.nodeTags) {
currentTags = currentTags.concat(args.nodeTags.split(',').map((tag) => tag.trim()));
currentTags = currentTags.concat(args.nodeTags.split(','));
}
requiredTags = requiredTags.map((tag) => tag.trim()).filter((tag) => tag !== '');
currentTags = currentTags.map((tag) => tag.trim()).filter((tag) => tag !== '');
args.jobLog(`Required Tags: ${requiredTags.join(',')}`);
args.jobLog(`Current Tags: ${currentTags.join(',')}`);