Merge pull request #455 from HaveAGitGat/2.10.01

2.10.01
make-only-subtitle-default
HaveAGitGat 2 years ago committed by GitHub
commit a7db890f14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -110,6 +110,21 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function
+ 'Operation: Filter. This classic plugin has Operation: ').concat(classicPlugin.details().Operation)
+ 'Please use the Run Classic Transcode Flow Plugin plugin instead.');
}
if (!Array.isArray(classicPlugin.dependencies)) return [3 /*break*/, 7];
if (!args.installClassicPluginDeps) return [3 /*break*/, 5];
args.jobLog("Installing dependencies for ".concat(pluginSourceId));
return [4 /*yield*/, args.installClassicPluginDeps(classicPlugin.dependencies)];
case 4:
_a.sent();
return [3 /*break*/, 6];
case 5:
args.jobLog("Not installing dependencies for ".concat(pluginSourceId, ", please update Tdarr"));
_a.label = 6;
case 6: return [3 /*break*/, 8];
case 7:
args.jobLog("No depedencies to install for ".concat(pluginSourceId));
_a.label = 8;
case 8:
container = (0, fileUtils_1.getContainer)(args.inputFileObj._id);
cacheFilePath = "".concat((0, fileUtils_1.getPluginWorkDir)(args), "/").concat((0, fileUtils_1.getFileName)(args.inputFileObj._id), ".").concat(container);
otherArguments = {
@ -126,7 +141,7 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function
job: args.job,
};
return [4 /*yield*/, classicPlugin.plugin(args.inputFileObj, args.librarySettings, args.inputs, otherArguments)];
case 4:
case 9:
result = _a.sent();
args.jobLog(JSON.stringify(result, null, 2));
outputNumber = (result === null || result === void 0 ? void 0 : result.processFile) ? 1 : 2;

@ -122,6 +122,21 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function
+ 'Operation: Transcode. This classic plugin has Operation: ').concat(classicPlugin.details().Operation)
+ 'Please use the Run Classic Filter Flow Plugin plugin instead.');
}
if (!Array.isArray(classicPlugin.dependencies)) return [3 /*break*/, 7];
if (!args.installClassicPluginDeps) return [3 /*break*/, 5];
args.jobLog("Installing dependencies for ".concat(pluginSourceId));
return [4 /*yield*/, args.installClassicPluginDeps(classicPlugin.dependencies)];
case 4:
_d.sent();
return [3 /*break*/, 6];
case 5:
args.jobLog("Not installing dependencies for ".concat(pluginSourceId, ", please update Tdarr"));
_d.label = 6;
case 6: return [3 /*break*/, 8];
case 7:
args.jobLog("No depedencies to install for ".concat(pluginSourceId));
_d.label = 8;
case 8:
container = (0, fileUtils_1.getContainer)(args.inputFileObj._id);
cacheFilePath = "".concat((0, fileUtils_1.getPluginWorkDir)(args), "/").concat((0, fileUtils_1.getFileName)(args.inputFileObj._id), ".").concat(container);
otherArguments = {
@ -138,7 +153,7 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function
job: args.job,
};
return [4 /*yield*/, classicPlugin.plugin(args.inputFileObj, args.librarySettings, args.inputs, otherArguments)];
case 4:
case 9:
result = _d.sent();
args.jobLog(JSON.stringify(result, null, 2));
if (!result) {
@ -252,7 +267,7 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function
updateWorker: args.updateWorker,
});
return [4 /*yield*/, cli.runCli()];
case 5:
case 10:
res = _d.sent();
if (res.cliExitCode !== 0) {
args.jobLog("Running ".concat(cliPath, " failed"));

@ -71,7 +71,7 @@ var details = function () { return ({
type: 'boolean',
defaultValue: 'false',
inputUI: {
type: 'text',
type: 'dropdown',
options: [
'false',
'true',

@ -70,7 +70,7 @@ var details = function () { return ({
type: 'boolean',
defaultValue: 'false',
inputUI: {
type: 'text',
type: 'dropdown',
options: [
'false',
'true',

@ -0,0 +1,133 @@
"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 };
}
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.plugin = exports.details = void 0;
/* eslint no-plusplus: ["error", { "allowForLoopAfterthoughts": true }] */
var details = function () { return ({
name: 'Wait',
description: 'Wait for a specified amount of time before continuing to the next plugin',
style: {
borderColor: 'yellow',
},
tags: '',
isStartPlugin: false,
pType: '',
requiresVersion: '2.11.01',
sidebarPosition: -1,
icon: 'faClock',
inputs: [
{
name: 'amount',
type: 'string',
defaultValue: '1',
inputUI: {
type: 'text',
},
tooltip: 'Specify the amount of time to wait',
},
{
name: 'unit',
type: 'string',
defaultValue: 'seconds',
inputUI: {
type: 'dropdown',
options: [
'seconds',
'minutes',
'hours',
],
},
tooltip: 'Specify the unit of time to wait',
},
],
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, _a, amount, unit, amountNum, multiplier, waitTime, finished, logWait;
return __generator(this, function (_b) {
switch (_b.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);
_a = args.inputs, amount = _a.amount, unit = _a.unit;
amountNum = Number(amount);
if (Number.isNaN(amountNum)) {
throw new Error('Amount must be a number');
}
multiplier = 1;
if (unit === 'seconds') {
multiplier = 1000;
}
else if (unit === 'minutes') {
multiplier = 60000;
}
else if (unit === 'hours') {
multiplier = 3600000;
}
waitTime = amountNum * multiplier;
args.jobLog("Waiting for ".concat(amount, " ").concat(unit));
args.jobLog("Waiting for ".concat(waitTime, " milliseconds"));
finished = false;
logWait = function () {
if (!finished) {
args.jobLog('Waiting...');
setTimeout(logWait, 5000);
}
};
logWait();
return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, waitTime); })];
case 1:
_b.sent();
finished = true;
return [2 /*return*/, {
outputFileObj: args.inputFileObj,
outputNumber: 1,
variables: args.variables,
}];
}
});
}); };
exports.plugin = plugin;

@ -81,6 +81,17 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
);
}
if (Array.isArray(classicPlugin.dependencies)) {
if (args.installClassicPluginDeps) {
args.jobLog(`Installing dependencies for ${pluginSourceId}`);
await args.installClassicPluginDeps(classicPlugin.dependencies);
} else {
args.jobLog(`Not installing dependencies for ${pluginSourceId}, please update Tdarr`);
}
} else {
args.jobLog(`No depedencies to install for ${pluginSourceId}`);
}
const container = getContainer(args.inputFileObj._id);
const cacheFilePath = `${getPluginWorkDir(args)}/${getFileName(args.inputFileObj._id)}.${container}`;

@ -84,6 +84,17 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
);
}
if (Array.isArray(classicPlugin.dependencies)) {
if (args.installClassicPluginDeps) {
args.jobLog(`Installing dependencies for ${pluginSourceId}`);
await args.installClassicPluginDeps(classicPlugin.dependencies);
} else {
args.jobLog(`Not installing dependencies for ${pluginSourceId}, please update Tdarr`);
}
} else {
args.jobLog(`No depedencies to install for ${pluginSourceId}`);
}
const container = getContainer(args.inputFileObj._id);
let cacheFilePath = `${getPluginWorkDir(args)}/${getFileName(args.inputFileObj._id)}.${container}`;

@ -36,7 +36,7 @@ const details = (): IpluginDetails => ({
type: 'boolean',
defaultValue: 'false',
inputUI: {
type: 'text',
type: 'dropdown',
options: [
'false',
'true',

@ -37,7 +37,7 @@ const details = ():IpluginDetails => ({
type: 'boolean',
defaultValue: 'false',
inputUI: {
type: 'text',
type: 'dropdown',
options: [
'false',
'true',

@ -0,0 +1,106 @@
import {
IpluginDetails,
IpluginInputArgs,
IpluginOutputArgs,
} from '../../../../FlowHelpers/1.0.0/interfaces/interfaces';
/* eslint no-plusplus: ["error", { "allowForLoopAfterthoughts": true }] */
const details = (): IpluginDetails => ({
name: 'Wait',
description: 'Wait for a specified amount of time before continuing to the next plugin',
style: {
borderColor: 'yellow',
},
tags: '',
isStartPlugin: false,
pType: '',
requiresVersion: '2.11.01',
sidebarPosition: -1,
icon: 'faClock',
inputs: [
{
name: 'amount',
type: 'string',
defaultValue: '1',
inputUI: {
type: 'text',
},
tooltip: 'Specify the amount of time to wait',
},
{
name: 'unit',
type: 'string',
defaultValue: 'seconds',
inputUI: {
type: 'dropdown',
options: [
'seconds',
'minutes',
'hours',
],
},
tooltip: 'Specify the unit of time to wait',
},
],
outputs: [
{
number: 1,
tooltip: 'Continue to next plugin',
},
],
});
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
const lib = require('../../../../../methods/lib')();
// eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign
args.inputs = lib.loadDefaultValues(args.inputs, details);
const {
amount,
unit,
} = args.inputs;
const amountNum = Number(amount);
if (Number.isNaN(amountNum)) {
throw new Error('Amount must be a number');
}
let multiplier = 1;
if (unit === 'seconds') {
multiplier = 1000;
} else if (unit === 'minutes') {
multiplier = 60000;
} else if (unit === 'hours') {
multiplier = 3600000;
}
const waitTime = amountNum * multiplier;
args.jobLog(`Waiting for ${amount} ${unit}`);
args.jobLog(`Waiting for ${waitTime} milliseconds`);
let finished = false;
const logWait = () => {
if (!finished) {
args.jobLog('Waiting...');
setTimeout(logWait, 5000);
}
};
logWait();
await new Promise((resolve) => setTimeout(resolve, waitTime));
finished = true;
return {
outputFileObj: args.inputFileObj,
outputNumber: 1,
variables: args.variables,
};
};
export {
details,
plugin,
};

@ -134,6 +134,7 @@ export interface IpluginInputArgs {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
axios: any,
},
installClassicPluginDeps: (deps: string[]) => void,
}
export interface IflowTemplate {

Loading…
Cancel
Save