Skip to content

Commit

Permalink
Merge branch 'master' into pr/587
Browse files Browse the repository at this point in the history
  • Loading branch information
HaveAGitGat committed May 8, 2024
2 parents 4e28afb + 8472813 commit 30a2c3e
Show file tree
Hide file tree
Showing 22 changed files with 2,959 additions and 991 deletions.
18 changes: 13 additions & 5 deletions .github/workflows/lint_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ jobs:
git config --global core.autocrlf false
git config --global core.eol lf
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
Expand All @@ -46,16 +49,21 @@ jobs:
contents: write

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v3
with:
ref: ${{ github.head_ref }}
ref: ${{ github.event.pull_request.head.sha }}

- uses: actions/setup-node@v3
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
if: ${{ github.event.pull_request.head.repo.full_name == 'org/repo' }}
with:
commit_message: Apply auto-build changes
commit_message: Apply auto-build changes

- run: |
(git diff --quiet HEAD -- 2>/dev/null && echo "No uncommitted changes" \
|| (echo "Error - Uncommitted changes found." && git --no-pager diff HEAD && exit 1))
592 changes: 336 additions & 256 deletions Community/Tdarr_Plugin_bsh1_Boosh_FFMPEG_QSV_HEVC.js

Large diffs are not rendered by default.

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
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,10 @@ var details = function () { return ({
label: 'Terms',
name: 'terms',
type: 'string',
// eslint-disable-next-line no-template-curly-in-string
defaultValue: '_720p,_1080p',
inputUI: {
type: 'text',
},
// eslint-disable-next-line no-template-curly-in-string
tooltip: 'Specify terms to check for in file name using comma seperated list e.g. _720p,_1080p',
},
],
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.plugin = exports.details = void 0;
var fileUtils_1 = require("../../../../FlowHelpers/1.0.0/fileUtils");
/* eslint no-plusplus: ["error", { "allowForLoopAfterthoughts": true }] */
var details = function () { return ({
name: 'Check File Name Includes',
description: 'Check if a file name includes specific terms. Only needs to match one term',
style: {
borderColor: 'orange',
},
tags: 'video',
isStartPlugin: false,
pType: '',
requiresVersion: '2.11.01',
sidebarPosition: -1,
icon: 'faQuestion',
inputs: [
{
label: 'Terms',
name: 'terms',
type: 'string',
defaultValue: '_720p,_1080p',
inputUI: {
type: 'text',
},
tooltip: 'Specify terms to check for in file name using comma seperated list e.g. _720p,_1080p',
},
{
label: 'Pattern (regular expression)',
name: 'pattern',
type: 'string',
defaultValue: '',
inputUI: {
type: 'text',
},
tooltip: 'Specify the pattern (regex) to check for in file name e.g. ^Pattern.*mkv$',
},
{
label: 'Include file directory in check',
name: 'includeFileDirectory',
type: 'boolean',
defaultValue: 'false',
inputUI: {
type: 'switch',
},
tooltip: 'Should the terms and patterns be evaluated against the file directory e.g. false, true',
},
],
outputs: [
{
number: 1,
tooltip: 'File name contains terms or patterns',
},
{
number: 2,
tooltip: 'File name does not contain any of the terms or patterns',
},
],
}); };
exports.details = details;
// eslint-disable-next-line @typescript-eslint/no-unused-vars
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 terms = String(args.inputs.terms);
var pattern = String(args.inputs.pattern);
var includeFileDirectory = args.inputs.includeFileDirectory;
var fileName = includeFileDirectory
? args.inputFileObj._id
: "".concat((0, fileUtils_1.getFileName)(args.inputFileObj._id), ".").concat((0, fileUtils_1.getContainer)(args.inputFileObj._id));
var searchCriteriasArray = terms.trim().split(',')
.map(function (term) { return term.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&'); }); // https://github.com/tc39/proposal-regex-escaping
if (pattern) {
searchCriteriasArray.push(pattern);
}
var searchCriteriaMatched = searchCriteriasArray
.find(function (searchCriteria) { return new RegExp(searchCriteria).test(fileName); });
var isAMatch = searchCriteriaMatched !== undefined;
if (isAMatch) {
args.jobLog("'".concat(fileName, "' includes '").concat(searchCriteriaMatched, "'"));
}
else {
args.jobLog("'".concat(fileName, "' does not include any of the terms or patterns"));
}
return {
outputFileObj: args.inputFileObj,
outputNumber: isAMatch ? 1 : 2,
variables: args.variables,
};
};
exports.plugin = plugin;
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 30a2c3e

Please sign in to comment.