Skip to content

Commit

Permalink
Merge branch 'master' into pr/612
Browse files Browse the repository at this point in the history
  • Loading branch information
@HaveAGitGat
HaveAGitGat committed May 7, 2024
2 parents 346a459 + 6a2aa79 commit 65ef386
Show file tree
Hide file tree
Showing 12 changed files with 1,740 additions and 969 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint_and_test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
with:
node-version: '18.x'

- run: npm i && npm i -g typescript && rm -rdf ./FlowPlugins && tsc
- run: npm i && npm i -g typescript && rm -rdf ./FlowPlugins && tsc -v && tsc

- uses: stefanzweifel/git-auto-commit-action@v5
with:
Expand Down
592 changes: 336 additions & 256 deletions Community/Tdarr_Plugin_bsh1_Boosh_FFMPEG_QSV_HEVC.js
View file

Large diffs are not rendered by default.

103 changes: 102 additions & 1 deletion FlowPlugins/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetVideoBitrate/1.0.0/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,88 @@ var details = function () { return ({
sidebarPosition: -1,
icon: '',
inputs: [
{
label: 'Use % of Input Bitrate',
name: 'useInputBitrate',
type: 'boolean',
defaultValue: 'false',
inputUI: {
type: 'switch',
},
tooltip: 'Specify whether to use a % of input bitrate as the output bitrate',
},
{
label: 'Target Bitrate %',
name: 'targetBitratePercent',
type: 'string',
defaultValue: '50',
inputUI: {
type: 'text',
displayConditions: {
logic: 'AND',
sets: [
{
logic: 'AND',
inputs: [
{
name: 'useInputBitrate',
value: 'true',
condition: '===',
},
],
},
],
},
},
tooltip: 'Specify the target bitrate as a % of the input bitrate',
},
{
label: 'Fallback Bitrate',
name: 'fallbackBitrate',
type: 'string',
defaultValue: '4000',
inputUI: {
type: 'text',
displayConditions: {
logic: 'AND',
sets: [
{
logic: 'AND',
inputs: [
{
name: 'useInputBitrate',
value: 'true',
condition: '===',
},
],
},
],
},
},
tooltip: 'Specify fallback bitrate in kbps if input bitrate is not available',
},
{
label: 'Bitrate',
name: 'bitrate',
type: 'string',
defaultValue: '5000',
inputUI: {
type: 'text',
displayConditions: {
logic: 'AND',
sets: [
{
logic: 'AND',
inputs: [
{
name: 'useInputBitrate',
value: 'true',
condition: '!==',
},
],
},
],
},
},
tooltip: 'Specify bitrate in kbps',
},
Expand All @@ -40,10 +115,36 @@ var plugin = function (args) {
var lib = require('../../../../../methods/lib')();
// eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign
args.inputs = lib.loadDefaultValues(args.inputs, details);
var useInputBitrate = args.inputs.useInputBitrate;
var targetBitratePercent = String(args.inputs.targetBitratePercent);
var fallbackBitrate = String(args.inputs.fallbackBitrate);
var bitrate = String(args.inputs.bitrate);
args.variables.ffmpegCommand.streams.forEach(function (stream) {
var _a, _b, _c, _d;
if (stream.codec_type === 'video') {
var ffType = (0, fileUtils_1.getFfType)(stream.codec_type);
stream.outputArgs.push("-b:".concat(ffType, ":{outputTypeIndex}"), "".concat(String(args.inputs.bitrate), "k"));
if (useInputBitrate) {
args.jobLog('Attempting to use % of input bitrate as output bitrate');
// check if input bitrate is available
var mediainfoIndex = stream.index + 1;
var inputBitrate = (_d = (_c = (_b = (_a = args === null || args === void 0 ? void 0 : args.inputFileObj) === null || _a === void 0 ? void 0 : _a.mediaInfo) === null || _b === void 0 ? void 0 : _b.track) === null || _c === void 0 ? void 0 : _c[mediainfoIndex]) === null || _d === void 0 ? void 0 : _d.BitRate;
if (inputBitrate) {
args.jobLog("Found input bitrate: ".concat(inputBitrate));
// @ts-expect-error type
inputBitrate = parseInt(inputBitrate, 10) / 1000;
var targetBitrate = (inputBitrate * (parseInt(targetBitratePercent, 10) / 100));
args.jobLog("Setting video bitrate as ".concat(targetBitrate, "k"));
stream.outputArgs.push("-b:".concat(ffType, ":{outputTypeIndex}"), "".concat(targetBitrate, "k"));
}
else {
args.jobLog("Unable to find input bitrate, setting fallback bitrate as ".concat(fallbackBitrate, "k"));
stream.outputArgs.push("-b:".concat(ffType, ":{outputTypeIndex}"), "".concat(fallbackBitrate, "k"));
}
}
else {
args.jobLog("Using fixed bitrate. Setting video bitrate as ".concat(bitrate, "k"));
stream.outputArgs.push("-b:".concat(ffType, ":{outputTypeIndex}"), "".concat(bitrate, "k"));
}
}
});
return {
Expand Down
4 changes: 2 additions & 2 deletions FlowPlugins/CommunityFlowPlugins/file/checkFileExtension/1.0.0/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ var plugin = function (args) {
// eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign
args.inputs = lib.loadDefaultValues(args.inputs, details);
var extensions = String(args.inputs.extensions);
var extensionArray = extensions.trim().split(',');
var extension = (0, fileUtils_1.getContainer)(args.inputFileObj._id);
var extensionArray = extensions.trim().split(',').map(function (row) { return row.toLowerCase(); });
var extension = (0, fileUtils_1.getContainer)(args.inputFileObj._id).toLowerCase();
var extensionMatch = false;
if (extensionArray.includes(extension)) {
extensionMatch = true;
Expand Down
50 changes: 24 additions & 26 deletions FlowPlugins/CommunityFlowPlugins/file/copyMoveFolderContent/1.0.0/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,33 +150,31 @@ var details = function () { return ({
],
}); };
exports.details = details;
var doOperation = function (_a) {
var args = _a.args, sourcePath = _a.sourcePath, destinationPath = _a.destinationPath, operation = _a.operation;
return __awaiter(void 0, void 0, void 0, function () {
return __generator(this, function (_b) {
switch (_b.label) {
case 0:
args.jobLog("Input path: ".concat(sourcePath));
args.jobLog("Output path: ".concat(destinationPath));
if (!(sourcePath === destinationPath)) return [3 /*break*/, 1];
args.jobLog("Input and output path are the same, skipping ".concat(operation));
return [3 /*break*/, 3];
case 1:
args.deps.fsextra.ensureDirSync((0, fileUtils_1.getFileAbosluteDir)(destinationPath));
return [4 /*yield*/, (0, fileMoveOrCopy_1.default)({
operation: operation,
sourcePath: sourcePath,
destinationPath: destinationPath,
args: args,
})];
case 2:
_b.sent();
_b.label = 3;
case 3: return [2 /*return*/];
}
});
var doOperation = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
var args = _b.args, sourcePath = _b.sourcePath, destinationPath = _b.destinationPath, operation = _b.operation;
return __generator(this, function (_c) {
switch (_c.label) {
case 0:
args.jobLog("Input path: ".concat(sourcePath));
args.jobLog("Output path: ".concat(destinationPath));
if (!(sourcePath === destinationPath)) return [3 /*break*/, 1];
args.jobLog("Input and output path are the same, skipping ".concat(operation));
return [3 /*break*/, 3];
case 1:
args.deps.fsextra.ensureDirSync((0, fileUtils_1.getFileAbosluteDir)(destinationPath));
return [4 /*yield*/, (0, fileMoveOrCopy_1.default)({
operation: operation,
sourcePath: sourcePath,
destinationPath: destinationPath,
args: args,
})];
case 2:
_c.sent();
_c.label = 3;
case 3: return [2 /*return*/];
}
});
};
}); };
// 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, keepRelativePath, allFiles, sourceDirectory, outputDirectory, copyOrMove, fileExtensions, outputPath, subStem, sourceDir, filesInDir, i;
Expand Down
Loading

0 comments on commit 65ef386

Please sign in to comment.