From 312c98801edb3341920e87d9b498212aa011ac95 Mon Sep 17 00:00:00 2001 From: HaveAGitGat <43864057+HaveAGitGat@users.noreply.github.com> Date: Mon, 28 Aug 2023 11:16:44 +0100 Subject: [PATCH] Add Copy to Working Directory --- .../file/copyToDirectory/1.0.0/index.js | 24 +---- .../file/copyToWorkDirectory/1.0.0/index.js | 102 ++++++++++++++++++ .../file/copyToDirectory/1.0.0/index.ts | 21 +--- .../file/copyToWorkDirectory/1.0.0/index.ts | 69 ++++++++++++ 4 files changed, 178 insertions(+), 38 deletions(-) create mode 100644 FlowPlugins/CommunityFlowPlugins/file/copyToWorkDirectory/1.0.0/index.js create mode 100644 FlowPluginsTs/CommunityFlowPlugins/file/copyToWorkDirectory/1.0.0/index.ts diff --git a/FlowPlugins/CommunityFlowPlugins/file/copyToDirectory/1.0.0/index.js b/FlowPlugins/CommunityFlowPlugins/file/copyToDirectory/1.0.0/index.js index 0bf3c89..23cb848 100644 --- a/FlowPlugins/CommunityFlowPlugins/file/copyToDirectory/1.0.0/index.js +++ b/FlowPlugins/CommunityFlowPlugins/file/copyToDirectory/1.0.0/index.js @@ -77,19 +77,6 @@ var details = function () { return ({ }, tooltip: 'Specify whether to keep the relative path', }, - { - name: 'copyToWorkDir', - type: 'boolean', - defaultValue: 'false', - inputUI: { - type: 'text', - options: [ - 'false', - 'true', - ], - }, - tooltip: 'Specify whether to copy to the working directory', - }, { name: 'makeWorkingFile', type: 'boolean', @@ -114,22 +101,19 @@ 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, _a, copyToWorkDir, keepRelativePath, makeWorkingFile, outputDirectory, originalFileName, newContainer, outputPath, subStem, ouputFilePath, workingFile; + var lib, _a, keepRelativePath, makeWorkingFile, outputDirectory, originalFileName, newContainer, outputPath, subStem, ouputFilePath, workingFile; 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, copyToWorkDir = _a.copyToWorkDir, keepRelativePath = _a.keepRelativePath, makeWorkingFile = _a.makeWorkingFile; + _a = args.inputs, keepRelativePath = _a.keepRelativePath, makeWorkingFile = _a.makeWorkingFile; outputDirectory = String(args.inputs.outputDirectory); originalFileName = (0, fileUtils_1.getFileName)(args.originalLibraryFile._id); newContainer = (0, fileUtils_1.getContainer)(args.inputFileObj._id); outputPath = ''; - if (copyToWorkDir) { - outputPath = args.workDir; - } - else if (keepRelativePath) { + if (keepRelativePath) { subStem = (0, fileUtils_1.getSubStem)({ inputPathStem: args.librarySettings.folder, inputPath: args.originalLibraryFile._id, @@ -153,7 +137,7 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function ], }); workingFile = args.inputFileObj._id; - if (makeWorkingFile || copyToWorkDir) { + if (makeWorkingFile) { workingFile = ouputFilePath; } args.jobLog("Input path: ".concat(args.inputFileObj._id)); diff --git a/FlowPlugins/CommunityFlowPlugins/file/copyToWorkDirectory/1.0.0/index.js b/FlowPlugins/CommunityFlowPlugins/file/copyToWorkDirectory/1.0.0/index.js new file mode 100644 index 0000000..636fedb --- /dev/null +++ b/FlowPlugins/CommunityFlowPlugins/file/copyToWorkDirectory/1.0.0/index.js @@ -0,0 +1,102 @@ +"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 __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.plugin = exports.details = void 0; +var fs_1 = require("fs"); +var fileUtils_1 = require("../../../../FlowHelpers/1.0.0/fileUtils"); +var normJoinPath_1 = __importDefault(require("../../../../FlowHelpers/1.0.0/normJoinPath")); +/* eslint no-plusplus: ["error", { "allowForLoopAfterthoughts": true }] */ +var details = function () { return ({ + name: 'Copy to Working Directory', + description: 'Copy the working file to the working directory of the Tdarr worker. ' + + 'Useful if you want to copy the file to the library cache before transcoding begins', + style: { + borderColor: 'green', + }, + tags: '', + isStartPlugin: false, + sidebarPosition: -1, + icon: 'faArrowRight', + inputs: [], + 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, originalFileName, newContainer, outputPath, ouputFilePath; + 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); + originalFileName = (0, fileUtils_1.getFileName)(args.originalLibraryFile._id); + newContainer = (0, fileUtils_1.getContainer)(args.inputFileObj._id); + outputPath = args.workDir; + ouputFilePath = (0, normJoinPath_1.default)({ + upath: args.deps.upath, + paths: [ + outputPath, + "".concat(originalFileName, ".").concat(newContainer), + ], + }); + args.jobLog("Input path: ".concat(args.inputFileObj._id)); + args.jobLog("Output path: ".concat(outputPath)); + args.deps.fsextra.ensureDirSync(outputPath); + return [4 /*yield*/, fs_1.promises.copyFile(args.inputFileObj._id, ouputFilePath)]; + case 1: + _a.sent(); + return [2 /*return*/, { + outputFileObj: { + _id: ouputFilePath, + }, + outputNumber: 1, + variables: args.variables, + }]; + } + }); +}); }; +exports.plugin = plugin; diff --git a/FlowPluginsTs/CommunityFlowPlugins/file/copyToDirectory/1.0.0/index.ts b/FlowPluginsTs/CommunityFlowPlugins/file/copyToDirectory/1.0.0/index.ts index eb1c981..eaa0ef7 100644 --- a/FlowPluginsTs/CommunityFlowPlugins/file/copyToDirectory/1.0.0/index.ts +++ b/FlowPluginsTs/CommunityFlowPlugins/file/copyToDirectory/1.0.0/index.ts @@ -42,19 +42,6 @@ const details = (): IpluginDetails => ({ }, tooltip: 'Specify whether to keep the relative path', }, - { - name: 'copyToWorkDir', - type: 'boolean', - defaultValue: 'false', - inputUI: { - type: 'text', - options: [ - 'false', - 'true', - ], - }, - tooltip: 'Specify whether to copy to the working directory', - }, { name: 'makeWorkingFile', type: 'boolean', @@ -84,7 +71,7 @@ const plugin = async (args: IpluginInputArgs): Promise => { args.inputs = lib.loadDefaultValues(args.inputs, details); const { - copyToWorkDir, keepRelativePath, makeWorkingFile, + keepRelativePath, makeWorkingFile, } = args.inputs; const outputDirectory = String(args.inputs.outputDirectory); @@ -94,9 +81,7 @@ const plugin = async (args: IpluginInputArgs): Promise => { let outputPath = ''; - if (copyToWorkDir) { - outputPath = args.workDir; - } else if (keepRelativePath) { + if (keepRelativePath) { const subStem = getSubStem({ inputPathStem: args.librarySettings.folder, inputPath: args.originalLibraryFile._id, @@ -123,7 +108,7 @@ const plugin = async (args: IpluginInputArgs): Promise => { let workingFile = args.inputFileObj._id; - if (makeWorkingFile || copyToWorkDir) { + if (makeWorkingFile) { workingFile = ouputFilePath; } diff --git a/FlowPluginsTs/CommunityFlowPlugins/file/copyToWorkDirectory/1.0.0/index.ts b/FlowPluginsTs/CommunityFlowPlugins/file/copyToWorkDirectory/1.0.0/index.ts new file mode 100644 index 0000000..c39cf4d --- /dev/null +++ b/FlowPluginsTs/CommunityFlowPlugins/file/copyToWorkDirectory/1.0.0/index.ts @@ -0,0 +1,69 @@ +import { promises as fs } from 'fs'; +import { getContainer, getFileName } from '../../../../FlowHelpers/1.0.0/fileUtils'; +import { + IpluginDetails, + IpluginInputArgs, + IpluginOutputArgs, +} from '../../../../FlowHelpers/1.0.0/interfaces/interfaces'; +import normJoinPath from '../../../../FlowHelpers/1.0.0/normJoinPath'; + +/* eslint no-plusplus: ["error", { "allowForLoopAfterthoughts": true }] */ +const details = (): IpluginDetails => ({ + name: 'Copy to Working Directory', + description: 'Copy the working file to the working directory of the Tdarr worker. ' + + 'Useful if you want to copy the file to the library cache before transcoding begins', + style: { + borderColor: 'green', + }, + tags: '', + + isStartPlugin: false, + sidebarPosition: -1, + icon: 'faArrowRight', + inputs: [], + 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); + + const originalFileName = getFileName(args.originalLibraryFile._id); + const newContainer = getContainer(args.inputFileObj._id); + + const outputPath = args.workDir; + + const ouputFilePath = normJoinPath({ + upath: args.deps.upath, + paths: [ + outputPath, + `${originalFileName}.${newContainer}`, + ], + }); + + args.jobLog(`Input path: ${args.inputFileObj._id}`); + args.jobLog(`Output path: ${outputPath}`); + + args.deps.fsextra.ensureDirSync(outputPath); + + await fs.copyFile(args.inputFileObj._id, ouputFilePath); + + return { + outputFileObj: { + _id: ouputFilePath, + }, + outputNumber: 1, + variables: args.variables, + }; +}; +export { + details, + plugin, +};