Merge branch 'baseRepository'

.github/workflows/lint_and_test.yml

@@ -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:
@@ -46,16 +49,22 @@ 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
+      ## fix this check
+      if: github.event.pull_request.head.repo.full_name == github.repository
       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))

FlowPlugins/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandRorderStreams/1.0.0/index.js

@@ -84,14 +84,7 @@ var plugin = function (args) {
         // eslint-disable-next-line no-param-reassign
         stream.typeIndex = index;
     });
-    var getSimplifiedStreams = function (streamsToSimplify) {
-        return streamsToSimplify.map(function (stream) { return ({
-            index: stream.typeIndex,
-            codec_name: stream.codec_name,
-            codec_type: stream.codec_type,
-        }); });
-    };
-    var originalStreams = JSON.stringify(getSimplifiedStreams(streams));
+    var originalStreams = JSON.stringify(streams);
     var sortStreams = function (sortType) {
         var items = sortType.inputs.split(',');
         items.reverse();

FlowPlugins/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetVideoBitrate/1.0.0/index.js

@@ -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',
         },
@@ -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 {

FlowPlugins/CommunityFlowPlugins/file/checkFileExtension/1.0.0/index.js

@@ -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;

FlowPlugins/CommunityFlowPlugins/file/checkFileNameIncludes/1.0.0/index.js

@@ -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',
         },
     ],

FlowPlugins/CommunityFlowPlugins/file/checkFileNameIncludes/2.0.0/index.js

@@ -20,36 +20,30 @@ 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',
         },
         {
             label: 'Pattern (regular expression)',
             name: 'pattern',
             type: 'string',
-            // eslint-disable-next-line no-template-curly-in-string
             defaultValue: '',
             inputUI: {
                 type: 'text',
             },
-            // eslint-disable-next-line no-template-curly-in-string
             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',
-            // eslint-disable-next-line no-template-curly-in-string
             defaultValue: 'false',
             inputUI: {
                 type: 'switch',
             },
-            // eslint-disable-next-line no-template-curly-in-string
             tooltip: 'Should the terms and patterns be evaluated against the file directory e.g. false, true',
         },
     ],
@@ -70,18 +64,26 @@ 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 buildArrayInput = function (arrayInput) { var _a, _b; return (_b = (_a = String(arrayInput)) === null || _a === void 0 ? void 0 : _a.trim().split(',')) !== null && _b !== void 0 ? _b : []; };
-    var fileName = "".concat((args.inputs.includeFileDirectory ? "".concat((0, fileUtils_1.getFileAbosluteDir)(args.inputFileObj._id), "/") : '')
-        + (0, fileUtils_1.getFileName)(args.inputFileObj._id), ".").concat((0, fileUtils_1.getContainer)(args.inputFileObj._id));
-    var searchCriteriasArray = buildArrayInput(args.inputs.terms)
+    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 (args.inputs.pattern)
-        searchCriteriasArray.push(String(args.inputs.pattern));
+    if (pattern) {
+        searchCriteriasArray.push(pattern);
+    }
     var searchCriteriaMatched = searchCriteriasArray
         .find(function (searchCriteria) { return new RegExp(searchCriteria).test(fileName); });
     var isAMatch = searchCriteriaMatched !== undefined;
-    if (isAMatch)
+    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,

FlowPlugins/CommunityFlowPlugins/file/copyMoveFolderContent/1.0.0/index.js

@@ -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;

FlowPlugins/CommunityFlowPlugins/tools/applyRadarrOrSonarrNamingPolicy/1.0.0/index.js

@@ -107,11 +107,11 @@ var details = function () { return ({
     outputs: [
         {
             number: 1,
-            tooltip: 'Radarr or Sonnar notified',
+            tooltip: 'Radarr or Sonarr notified',
         },
         {
             number: 2,
-            tooltip: 'Radarr or Sonnar do not know this file',
+            tooltip: 'Radarr or Sonarr do not know this file',
         },
     ],
 }); };
@@ -123,7 +123,7 @@ var getFileInfoFromLookup = function (args, arrApp, fileName) { return __awaiter
         switch (_c.label) {
             case 0:
                 fInfo = { id: '-1' };
-                imdbId = (_b = (_a = /\b(tt|nm|co|ev|ch|ni)\d{7,10}\b/i.exec(fileName)) === null || _a === void 0 ? void 0 : _a.at(0)) !== null && _b !== void 0 ? _b : '';
+                imdbId = (_b = (_a = /\b(tt|nm|co|ev|ch|ni)\d{7,10}?\b/i.exec(fileName)) === null || _a === void 0 ? void 0 : _a.at(0)) !== null && _b !== void 0 ? _b : '';
                 if (!(imdbId !== '')) return [3 /*break*/, 2];
                 return [4 /*yield*/, args.deps.axios({
                         method: 'get',