make-only-subtitle-default
HaveAGitGat 2 years ago
commit 361f5d00ac

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

@ -150,11 +150,10 @@ 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) {
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));
@ -170,13 +169,12 @@ var doOperation = function (_a) {
args: args,
})];
case 2:
_b.sent();
_b.label = 3;
_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;

@ -69,30 +69,29 @@ var compareOldNew = function (_a) {
+ " cache file of size ".concat(sourceFileSize));
}
};
var tryMove = function (_a) {
var sourcePath = _a.sourcePath, destinationPath = _a.destinationPath, sourceFileSize = _a.sourceFileSize, args = _a.args;
return __awaiter(void 0, void 0, void 0, function () {
var tryMove = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
var error, err_2, destinationSize;
return __generator(this, function (_b) {
switch (_b.label) {
var sourcePath = _b.sourcePath, destinationPath = _b.destinationPath, sourceFileSize = _b.sourceFileSize, args = _b.args;
return __generator(this, function (_c) {
switch (_c.label) {
case 0:
args.jobLog("Attempting move from ".concat(sourcePath, " to ").concat(destinationPath, ", method 1"));
error = false;
_b.label = 1;
_c.label = 1;
case 1:
_b.trys.push([1, 3, , 4]);
_c.trys.push([1, 3, , 4]);
return [4 /*yield*/, fs_1.promises.rename(sourcePath, destinationPath)];
case 2:
_b.sent();
_c.sent();
return [3 /*break*/, 4];
case 3:
err_2 = _b.sent();
err_2 = _c.sent();
error = true;
args.jobLog("File move error: ".concat(JSON.stringify(err_2)));
return [3 /*break*/, 4];
case 4: return [4 /*yield*/, getSizeBytes(destinationPath)];
case 5:
destinationSize = _b.sent();
destinationSize = _c.sent();
compareOldNew({
sourceFileSize: sourceFileSize,
destinationSize: destinationSize,
@ -104,15 +103,13 @@ var tryMove = function (_a) {
return [2 /*return*/, true];
}
});
});
};
}); };
// eslint-disable-next-line @typescript-eslint/no-unused-vars
var tryMvdir = function (_a) {
var sourcePath = _a.sourcePath, destinationPath = _a.destinationPath, sourceFileSize = _a.sourceFileSize, args = _a.args;
return __awaiter(void 0, void 0, void 0, function () {
var tryMvdir = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
var error, destinationSize;
return __generator(this, function (_b) {
switch (_b.label) {
var sourcePath = _b.sourcePath, destinationPath = _b.destinationPath, sourceFileSize = _b.sourceFileSize, args = _b.args;
return __generator(this, function (_c) {
switch (_c.label) {
case 0:
args.jobLog("Attempting move from ".concat(sourcePath, " to ").concat(destinationPath, ", method 2"));
error = false;
@ -130,10 +127,10 @@ var tryMvdir = function (_a) {
});
})];
case 1:
_b.sent();
_c.sent();
return [4 /*yield*/, getSizeBytes(destinationPath)];
case 2:
destinationSize = _b.sent();
destinationSize = _c.sent();
compareOldNew({
sourceFileSize: sourceFileSize,
destinationSize: destinationSize,
@ -145,15 +142,13 @@ var tryMvdir = function (_a) {
return [2 /*return*/, true];
}
});
});
};
}); };
// Keep in e.g. https://github.com/HaveAGitGat/Tdarr/issues/858
var tyNcp = function (_a) {
var sourcePath = _a.sourcePath, destinationPath = _a.destinationPath, sourceFileSize = _a.sourceFileSize, args = _a.args;
return __awaiter(void 0, void 0, void 0, function () {
var tyNcp = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
var error_1, destinationSize;
return __generator(this, function (_b) {
switch (_b.label) {
var sourcePath = _b.sourcePath, destinationPath = _b.destinationPath, sourceFileSize = _b.sourceFileSize, args = _b.args;
return __generator(this, function (_c) {
switch (_c.label) {
case 0:
if (!args.deps.ncp) return [3 /*break*/, 3];
args.jobLog("Attempting copy from ".concat(sourcePath, " to ").concat(destinationPath, " , method 1"));
@ -171,10 +166,10 @@ var tyNcp = function (_a) {
});
})];
case 1:
_b.sent();
_c.sent();
return [4 /*yield*/, getSizeBytes(destinationPath)];
case 2:
destinationSize = _b.sent();
destinationSize = _c.sent();
compareOldNew({
sourceFileSize: sourceFileSize,
destinationSize: destinationSize,
@ -187,32 +182,30 @@ var tyNcp = function (_a) {
case 3: return [2 /*return*/, false];
}
});
});
};
var tryNormalCopy = function (_a) {
var sourcePath = _a.sourcePath, destinationPath = _a.destinationPath, sourceFileSize = _a.sourceFileSize, args = _a.args;
return __awaiter(void 0, void 0, void 0, function () {
}); };
var tryNormalCopy = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
var error, err_3, destinationSize;
return __generator(this, function (_b) {
switch (_b.label) {
var sourcePath = _b.sourcePath, destinationPath = _b.destinationPath, sourceFileSize = _b.sourceFileSize, args = _b.args;
return __generator(this, function (_c) {
switch (_c.label) {
case 0:
args.jobLog("Attempting copy from ".concat(sourcePath, " to ").concat(destinationPath, " , method 2"));
error = false;
_b.label = 1;
_c.label = 1;
case 1:
_b.trys.push([1, 3, , 4]);
_c.trys.push([1, 3, , 4]);
return [4 /*yield*/, fs_1.promises.copyFile(sourcePath, destinationPath)];
case 2:
_b.sent();
_c.sent();
return [3 /*break*/, 4];
case 3:
err_3 = _b.sent();
err_3 = _c.sent();
error = true;
args.jobLog("File copy error: ".concat(JSON.stringify(err_3)));
return [3 /*break*/, 4];
case 4: return [4 /*yield*/, getSizeBytes(destinationPath)];
case 5:
destinationSize = _b.sent();
destinationSize = _c.sent();
compareOldNew({
sourceFileSize: sourceFileSize,
destinationSize: destinationSize,
@ -224,41 +217,37 @@ var tryNormalCopy = function (_a) {
return [2 /*return*/, true];
}
});
});
};
var cleanSourceFile = function (_a) {
var args = _a.args, sourcePath = _a.sourcePath;
return __awaiter(void 0, void 0, void 0, function () {
}); };
var cleanSourceFile = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
var err_4;
return __generator(this, function (_b) {
switch (_b.label) {
var args = _b.args, sourcePath = _b.sourcePath;
return __generator(this, function (_c) {
switch (_c.label) {
case 0:
_b.trys.push([0, 2, , 3]);
_c.trys.push([0, 2, , 3]);
args.jobLog("Deleting source file ".concat(sourcePath));
return [4 /*yield*/, fs_1.promises.unlink(sourcePath)];
case 1:
_b.sent();
_c.sent();
return [3 /*break*/, 3];
case 2:
err_4 = _b.sent();
err_4 = _c.sent();
args.jobLog("Failed to delete source file ".concat(sourcePath, ": ").concat(JSON.stringify(err_4)));
return [3 /*break*/, 3];
case 3: return [2 /*return*/];
}
});
});
};
var fileMoveOrCopy = function (_a) {
var operation = _a.operation, sourcePath = _a.sourcePath, destinationPath = _a.destinationPath, args = _a.args;
return __awaiter(void 0, void 0, void 0, function () {
}); };
var fileMoveOrCopy = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
var sourceFileSize, moved, ncpd, copied;
return __generator(this, function (_b) {
switch (_b.label) {
var operation = _b.operation, sourcePath = _b.sourcePath, destinationPath = _b.destinationPath, args = _b.args;
return __generator(this, function (_c) {
switch (_c.label) {
case 0:
args.jobLog('Calculating cache file size in bytes');
return [4 /*yield*/, getSizeBytes(sourcePath)];
case 1:
sourceFileSize = _b.sent();
sourceFileSize = _c.sent();
args.jobLog("".concat(sourceFileSize));
if (!(operation === 'move')) return [3 /*break*/, 3];
return [4 /*yield*/, tryMove({
@ -268,7 +257,7 @@ var fileMoveOrCopy = function (_a) {
sourceFileSize: sourceFileSize,
})];
case 2:
moved = _b.sent();
moved = _c.sent();
if (moved) {
return [2 /*return*/, true];
}
@ -283,7 +272,7 @@ var fileMoveOrCopy = function (_a) {
// return true;
// }
args.jobLog('Failed to move file, trying copy');
_b.label = 3;
_c.label = 3;
case 3: return [4 /*yield*/, tyNcp({
sourcePath: sourcePath,
destinationPath: destinationPath,
@ -291,7 +280,7 @@ var fileMoveOrCopy = function (_a) {
sourceFileSize: sourceFileSize,
})];
case 4:
ncpd = _b.sent();
ncpd = _c.sent();
if (!ncpd) return [3 /*break*/, 7];
if (!(operation === 'move')) return [3 /*break*/, 6];
return [4 /*yield*/, cleanSourceFile({
@ -299,8 +288,8 @@ var fileMoveOrCopy = function (_a) {
sourcePath: sourcePath,
})];
case 5:
_b.sent();
_b.label = 6;
_c.sent();
_c.label = 6;
case 6: return [2 /*return*/, true];
case 7: return [4 /*yield*/, tryNormalCopy({
sourcePath: sourcePath,
@ -309,7 +298,7 @@ var fileMoveOrCopy = function (_a) {
sourceFileSize: sourceFileSize,
})];
case 8:
copied = _b.sent();
copied = _c.sent();
if (!copied) return [3 /*break*/, 11];
if (!(operation === 'move')) return [3 /*break*/, 10];
return [4 /*yield*/, cleanSourceFile({
@ -317,12 +306,11 @@ var fileMoveOrCopy = function (_a) {
sourcePath: sourcePath,
})];
case 9:
_b.sent();
_b.label = 10;
_c.sent();
_c.label = 10;
case 10: return [2 /*return*/, true];
case 11: throw new Error("Failed to ".concat(operation, " file"));
}
});
});
};
}); };
exports.default = fileMoveOrCopy;

@ -80,15 +80,14 @@ var getFileSize = function (file) { return __awaiter(void 0, void 0, void 0, fun
});
}); };
exports.getFileSize = getFileSize;
var moveFileAndValidate = function (_a) {
var inputPath = _a.inputPath, outputPath = _a.outputPath, args = _a.args;
return __awaiter(void 0, void 0, void 0, function () {
var moveFileAndValidate = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
var inputSize, res1, outputSize, err_1, res2, errMessage;
return __generator(this, function (_b) {
switch (_b.label) {
var inputPath = _b.inputPath, outputPath = _b.outputPath, args = _b.args;
return __generator(this, function (_c) {
switch (_c.label) {
case 0: return [4 /*yield*/, (0, exports.getFileSize)(inputPath)];
case 1:
inputSize = _b.sent();
inputSize = _c.sent();
args.jobLog("Attempt 1: Moving file from ".concat(inputPath, " to ").concat(outputPath));
return [4 /*yield*/, new Promise(function (resolve) {
args.deps.gracefulfs.rename(inputPath, outputPath, function (err) {
@ -103,17 +102,17 @@ var moveFileAndValidate = function (_a) {
});
})];
case 2:
res1 = _b.sent();
res1 = _c.sent();
outputSize = 0;
_b.label = 3;
_c.label = 3;
case 3:
_b.trys.push([3, 5, , 6]);
_c.trys.push([3, 5, , 6]);
return [4 /*yield*/, (0, exports.getFileSize)(outputPath)];
case 4:
outputSize = _b.sent();
outputSize = _c.sent();
return [3 /*break*/, 6];
case 5:
err_1 = _b.sent();
err_1 = _c.sent();
args.jobLog(JSON.stringify(err_1));
return [3 /*break*/, 6];
case 6:
@ -135,10 +134,10 @@ var moveFileAndValidate = function (_a) {
});
})];
case 7:
res2 = _b.sent();
res2 = _c.sent();
return [4 /*yield*/, (0, exports.getFileSize)(outputPath)];
case 8:
outputSize = _b.sent();
outputSize = _c.sent();
if (!res2 || inputSize !== outputSize) {
if (inputSize !== outputSize) {
args.jobLog("File sizes do not match, input: ".concat(inputSize, " ")
@ -148,12 +147,11 @@ var moveFileAndValidate = function (_a) {
args.jobLog(errMessage);
throw new Error(errMessage);
}
_b.label = 9;
_c.label = 9;
case 9: return [2 /*return*/];
}
});
});
};
}); };
exports.moveFileAndValidate = moveFileAndValidate;
var getPluginWorkDir = function (args) {
var pluginWorkDir = "".concat(args.workDir, "/").concat(new Date().getTime());

@ -61,18 +61,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
Object.defineProperty(exports, "__esModule", { value: true });
exports.getEncoder = exports.getBestNvencDevice = exports.hasEncoder = void 0;
var os_1 = __importDefault(require("os"));
var hasEncoder = function (_a) {
var ffmpegPath = _a.ffmpegPath, encoder = _a.encoder, inputArgs = _a.inputArgs, outputArgs = _a.outputArgs, filter = _a.filter, args = _a.args;
return __awaiter(void 0, void 0, void 0, function () {
var hasEncoder = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
var spawn, isEnabled, commandArr_1, err_1;
return __generator(this, function (_b) {
switch (_b.label) {
var ffmpegPath = _b.ffmpegPath, encoder = _b.encoder, inputArgs = _b.inputArgs, outputArgs = _b.outputArgs, filter = _b.filter, args = _b.args;
return __generator(this, function (_c) {
switch (_c.label) {
case 0:
spawn = require('child_process').spawn;
isEnabled = false;
_b.label = 1;
_c.label = 1;
case 1:
_b.trys.push([1, 3, , 4]);
_c.trys.push([1, 3, , 4]);
commandArr_1 = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], inputArgs, true), [
'-f',
'lavfi',
@ -122,19 +121,18 @@ var hasEncoder = function (_a) {
}
})];
case 2:
isEnabled = _b.sent();
isEnabled = _c.sent();
args.jobLog("Encoder ".concat(encoder, " is ").concat(isEnabled ? 'enabled' : 'disabled'));
return [3 /*break*/, 4];
case 3:
err_1 = _b.sent();
err_1 = _c.sent();
// eslint-disable-next-line no-console
console.log(err_1);
return [3 /*break*/, 4];
case 4: return [2 /*return*/, isEnabled];
}
});
});
};
}); };
exports.hasEncoder = hasEncoder;
// credit to UNCode101 for this
var getBestNvencDevice = function (_a) {
@ -207,12 +205,11 @@ var encoderFilter = function (encoder, targetCodec) {
}
return false;
};
var getEncoder = function (_a) {
var targetCodec = _a.targetCodec, hardwareEncoding = _a.hardwareEncoding, hardwareType = _a.hardwareType, args = _a.args;
return __awaiter(void 0, void 0, void 0, function () {
var supportedGpuEncoders, gpuEncoders, filteredGpuEncoders, idx, _i, filteredGpuEncoders_1, gpuEncoder, _b, enabledDevices, res;
return __generator(this, function (_c) {
switch (_c.label) {
var getEncoder = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
var supportedGpuEncoders, gpuEncoders, filteredGpuEncoders, idx, _i, filteredGpuEncoders_1, gpuEncoder, _c, enabledDevices, res;
var targetCodec = _b.targetCodec, hardwareEncoding = _b.hardwareEncoding, hardwareType = _b.hardwareType, args = _b.args;
return __generator(this, function (_d) {
switch (_d.label) {
case 0:
supportedGpuEncoders = ['hevc', 'h264', 'av1'];
if (!(args.workerType
@ -348,12 +345,12 @@ var getEncoder = function (_a) {
}
args.jobLog(JSON.stringify({ filteredGpuEncoders: filteredGpuEncoders }));
_i = 0, filteredGpuEncoders_1 = filteredGpuEncoders;
_c.label = 1;
_d.label = 1;
case 1:
if (!(_i < filteredGpuEncoders_1.length)) return [3 /*break*/, 4];
gpuEncoder = filteredGpuEncoders_1[_i];
// eslint-disable-next-line no-await-in-loop
_b = gpuEncoder;
_c = gpuEncoder;
return [4 /*yield*/, (0, exports.hasEncoder)({
ffmpegPath: args.ffmpegPath,
encoder: gpuEncoder.encoder,
@ -364,8 +361,8 @@ var getEncoder = function (_a) {
})];
case 2:
// eslint-disable-next-line no-await-in-loop
_b.enabled = _c.sent();
_c.label = 3;
_c.enabled = _d.sent();
_d.label = 3;
case 3:
_i++;
return [3 /*break*/, 1];
@ -399,7 +396,7 @@ var getEncoder = function (_a) {
if (!supportedGpuEncoders.includes(targetCodec)) {
args.jobLog("Target codec ".concat(targetCodec, " is not supported for GPU encoding"));
}
_c.label = 6;
_d.label = 6;
case 6:
if (targetCodec === 'hevc') {
return [2 /*return*/, {
@ -437,6 +434,5 @@ var getEncoder = function (_a) {
}];
}
});
});
};
}); };
exports.getEncoder = getEncoder;

Loading…
Cancel
Save