From 0842b351d5cf80cd41f21ff0861cc311c620dcf8 Mon Sep 17 00:00:00 2001 From: HaveAGitGat <43864057+HaveAGitGat@users.noreply.github.com> Date: Wed, 4 Oct 2023 05:58:47 +0100 Subject: [PATCH 1/3] Set forceEncoding default to true --- .../ffmpegCommand/ffmpegCommandSetVideoEncoder/1.0.0/index.js | 2 +- .../ffmpegCommand/ffmpegCommandSetVideoEncoder/1.0.0/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FlowPlugins/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetVideoEncoder/1.0.0/index.js b/FlowPlugins/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetVideoEncoder/1.0.0/index.js index dbf3f3aa6..45ab166ea 100644 --- a/FlowPlugins/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetVideoEncoder/1.0.0/index.js +++ b/FlowPlugins/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetVideoEncoder/1.0.0/index.js @@ -143,7 +143,7 @@ var details = function () { return ({ { name: 'forceEncoding', type: 'boolean', - defaultValue: 'false', + defaultValue: 'true', inputUI: { type: 'dropdown', options: [ diff --git a/FlowPluginsTs/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetVideoEncoder/1.0.0/index.ts b/FlowPluginsTs/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetVideoEncoder/1.0.0/index.ts index ddcb98120..094f233e1 100644 --- a/FlowPluginsTs/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetVideoEncoder/1.0.0/index.ts +++ b/FlowPluginsTs/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetVideoEncoder/1.0.0/index.ts @@ -111,7 +111,7 @@ const details = (): IpluginDetails => ({ { name: 'forceEncoding', type: 'boolean', - defaultValue: 'false', + defaultValue: 'true', inputUI: { type: 'dropdown', options: [ From 202f255f4f05a5e8e6aea07d194cdba66c6a4208 Mon Sep 17 00:00:00 2001 From: HaveAGitGat <43864057+HaveAGitGat@users.noreply.github.com> Date: Wed, 4 Oct 2023 05:59:11 +0100 Subject: [PATCH 2/3] Reuse newContainer var --- .../ffmpegCommand/ffmpegCommandSetContainer/1.0.0/index.js | 2 +- .../ffmpegCommand/ffmpegCommandSetContainer/1.0.0/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FlowPlugins/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetContainer/1.0.0/index.js b/FlowPlugins/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetContainer/1.0.0/index.js index cb24a1d95..6065dfc80 100644 --- a/FlowPlugins/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetContainer/1.0.0/index.js +++ b/FlowPlugins/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetContainer/1.0.0/index.js @@ -59,7 +59,7 @@ var plugin = function (args) { args.inputs = lib.loadDefaultValues(args.inputs, details); var newContainer = String(args.inputs.container); var forceConform = args.inputs.forceConform; - if ((0, fileUtils_1.getContainer)(args.inputFileObj._id) !== args.inputs.container) { + if ((0, fileUtils_1.getContainer)(args.inputFileObj._id) !== newContainer) { args.variables.ffmpegCommand.container = newContainer; args.variables.ffmpegCommand.shouldProcess = true; if (forceConform === true) { diff --git a/FlowPluginsTs/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetContainer/1.0.0/index.ts b/FlowPluginsTs/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetContainer/1.0.0/index.ts index c14e677dc..e5beb15c2 100644 --- a/FlowPluginsTs/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetContainer/1.0.0/index.ts +++ b/FlowPluginsTs/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetContainer/1.0.0/index.ts @@ -69,7 +69,7 @@ const plugin = (args: IpluginInputArgs): IpluginOutputArgs => { const newContainer = String(args.inputs.container); const { forceConform } = args.inputs; - if (getContainer(args.inputFileObj._id) !== args.inputs.container) { + if (getContainer(args.inputFileObj._id) !== newContainer) { args.variables.ffmpegCommand.container = newContainer; args.variables.ffmpegCommand.shouldProcess = true; From e782244417fc337e55110c409c1b26e53ac06204 Mon Sep 17 00:00:00 2001 From: HaveAGitGat <43864057+HaveAGitGat@users.noreply.github.com> Date: Wed, 4 Oct 2023 06:18:09 +0100 Subject: [PATCH 3/3] Run health check --- .../video/runHealthCheck/1.0.0/index.js | 140 ++++++++++++++++++ .../video/runHealthCheck/1.0.0/index.ts | 113 ++++++++++++++ 2 files changed, 253 insertions(+) create mode 100644 FlowPlugins/CommunityFlowPlugins/video/runHealthCheck/1.0.0/index.js create mode 100644 FlowPluginsTs/CommunityFlowPlugins/video/runHealthCheck/1.0.0/index.ts diff --git a/FlowPlugins/CommunityFlowPlugins/video/runHealthCheck/1.0.0/index.js b/FlowPlugins/CommunityFlowPlugins/video/runHealthCheck/1.0.0/index.js new file mode 100644 index 000000000..7750de4ed --- /dev/null +++ b/FlowPlugins/CommunityFlowPlugins/video/runHealthCheck/1.0.0/index.js @@ -0,0 +1,140 @@ +"use strict"; +/* eslint no-plusplus: ["error", { "allowForLoopAfterthoughts": true }] */ +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; +var cliUtils_1 = require("../../../../FlowHelpers/1.0.0/cliUtils"); +var fileUtils_1 = require("../../../../FlowHelpers/1.0.0/fileUtils"); +/* eslint-disable no-param-reassign */ +var details = function () { return ({ + name: 'Run Health Check', + description: 'Run a quick health check using HandBrake or a thorough health check using FFmpeg', + style: { + borderColor: '#6efefc', + }, + tags: 'video', + isStartPlugin: false, + pType: '', + requiresVersion: '2.11.01', + sidebarPosition: -1, + icon: '', + inputs: [ + { + name: 'type', + type: 'string', + defaultValue: 'quick', + inputUI: { + type: 'dropdown', + options: [ + 'quick', + 'thorough', + ], + }, + tooltip: 'Specify the container to use', + }, + ], + 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, type, outputFilePath, cliPath, cliArgs, cli, res; + 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); + type = String(args.inputs.type); + args.jobLog("Running health check of type ".concat(type)); + outputFilePath = "".concat((0, fileUtils_1.getPluginWorkDir)(args), "/").concat((0, fileUtils_1.getFileName)(args.inputFileObj._id)) + + ".".concat((0, fileUtils_1.getContainer)(args.inputFileObj._id)); + cliPath = args.handbrakePath; + cliArgs = [ + '-i', + args.inputFileObj._id, + '-o', + outputFilePath, + '--scan', + ]; + if (type === 'thorough') { + cliPath = args.ffmpegPath; + cliArgs = [ + '-stats', + '-v', + 'error', + '-i', + args.inputFileObj._id, + '-f', + 'null', + '-max_muxing_queue_size', + '9999', + outputFilePath, + ]; + } + cli = new cliUtils_1.CLI({ + cli: cliPath, + spawnArgs: cliArgs, + spawnOpts: {}, + jobLog: args.jobLog, + outputFilePath: outputFilePath, + inputFileObj: args.inputFileObj, + logFullCliOutput: args.logFullCliOutput, + updateWorker: args.updateWorker, + }); + return [4 /*yield*/, cli.runCli()]; + case 1: + res = _a.sent(); + if (res.cliExitCode !== 0) { + args.jobLog('Running CLI failed'); + throw new Error('Running CLI failed'); + } + return [2 /*return*/, { + outputFileObj: args.inputFileObj, + outputNumber: 1, + variables: args.variables, + }]; + } + }); +}); }; +exports.plugin = plugin; diff --git a/FlowPluginsTs/CommunityFlowPlugins/video/runHealthCheck/1.0.0/index.ts b/FlowPluginsTs/CommunityFlowPlugins/video/runHealthCheck/1.0.0/index.ts new file mode 100644 index 000000000..7a9d9969c --- /dev/null +++ b/FlowPluginsTs/CommunityFlowPlugins/video/runHealthCheck/1.0.0/index.ts @@ -0,0 +1,113 @@ +/* eslint no-plusplus: ["error", { "allowForLoopAfterthoughts": true }] */ + +import { CLI } from '../../../../FlowHelpers/1.0.0/cliUtils'; +import { getContainer, getFileName, getPluginWorkDir } from '../../../../FlowHelpers/1.0.0/fileUtils'; +import { + IpluginDetails, + IpluginInputArgs, + IpluginOutputArgs, +} from '../../../../FlowHelpers/1.0.0/interfaces/interfaces'; + +/* eslint-disable no-param-reassign */ +const details = (): IpluginDetails => ({ + name: 'Run Health Check', + description: 'Run a quick health check using HandBrake or a thorough health check using FFmpeg', + style: { + borderColor: '#6efefc', + }, + tags: 'video', + isStartPlugin: false, + pType: '', + requiresVersion: '2.11.01', + sidebarPosition: -1, + icon: '', + inputs: [ + { + name: 'type', + type: 'string', + defaultValue: 'quick', + inputUI: { + type: 'dropdown', + options: [ + 'quick', + 'thorough', + ], + }, + tooltip: 'Specify the container to use', + }, + ], + 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 type = String(args.inputs.type); + + args.jobLog(`Running health check of type ${type}`); + + const outputFilePath = `${getPluginWorkDir(args)}/${getFileName(args.inputFileObj._id)}` + + `.${getContainer(args.inputFileObj._id)}`; + + let cliPath = args.handbrakePath; + let cliArgs = [ + '-i', + args.inputFileObj._id, + '-o', + outputFilePath, + '--scan', + ]; + + if (type === 'thorough') { + cliPath = args.ffmpegPath; + + cliArgs = [ + '-stats', + '-v', + 'error', + '-i', + args.inputFileObj._id, + '-f', + 'null', + '-max_muxing_queue_size', + '9999', + outputFilePath, + ]; + } + + const cli = new CLI({ + cli: cliPath, + spawnArgs: cliArgs, + spawnOpts: {}, + jobLog: args.jobLog, + outputFilePath, + inputFileObj: args.inputFileObj, + logFullCliOutput: args.logFullCliOutput, + updateWorker: args.updateWorker, + }); + + const res = await cli.runCli(); + + if (res.cliExitCode !== 0) { + args.jobLog('Running CLI failed'); + throw new Error('Running CLI failed'); + } + + return { + outputFileObj: args.inputFileObj, + outputNumber: 1, + variables: args.variables, + }; +}; +export { + details, + plugin, +};