gabehf
/
Tdarr_Plugins
mirror of https://github.com/gabehf/Tdarr_Plugins.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #549 from HaveAGitGat/disable_mvdir

Browse Source 
Disable tryMvdir
make-only-subtitle-default
HaveAGitGat 2 years ago committed by GitHub
parent 0fbfb7cc8c c8fec0c76d
commit 01ca0ce2ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File

58
FlowPlugins/FlowHelpers/1.0.0/fileMoveOrCopy.js
Unescape View File

@ -106,6 +106,7 @@ var tryMove = function (_a) {
}); });
}); });
}; };
// eslint-disable-next-line @typescript-eslint/no-unused-vars
var tryMvdir = function (_a) { var tryMvdir = function (_a) {
var sourcePath = _a.sourcePath, destinationPath = _a.destinationPath, sourceFileSize = _a.sourceFileSize, args = _a.args; var sourcePath = _a.sourcePath, destinationPath = _a.destinationPath, sourceFileSize = _a.sourceFileSize, args = _a.args;
return __awaiter(void 0, void 0, void 0, function () { return __awaiter(void 0, void 0, void 0, function () {
@ -250,7 +251,7 @@ var cleanSourceFile = function (_a) {
var fileMoveOrCopy = function (_a) { var fileMoveOrCopy = function (_a) {
var operation = _a.operation, sourcePath = _a.sourcePath, destinationPath = _a.destinationPath, args = _a.args; var operation = _a.operation, sourcePath = _a.sourcePath, destinationPath = _a.destinationPath, args = _a.args;
return __awaiter(void 0, void 0, void 0, function () { return __awaiter(void 0, void 0, void 0, function () {
var sourceFileSize, moved, mvdird, ncpd, copied; var sourceFileSize, moved, ncpd, copied;
return __generator(this, function (_b) { return __generator(this, function (_b) {
switch (_b.label) { switch (_b.label) {
case 0: case 0:
@ -259,7 +260,7 @@ var fileMoveOrCopy = function (_a) {
case 1: case 1:
sourceFileSize = _b.sent(); sourceFileSize = _b.sent();
args.jobLog("".concat(sourceFileSize)); args.jobLog("".concat(sourceFileSize));
if (!(operation === 'move')) return [3 /*break*/, 4]; if (!(operation === 'move')) return [3 /*break*/, 3];
return [4 /*yield*/, tryMove({ return [4 /*yield*/, tryMove({
sourcePath: sourcePath, sourcePath: sourcePath,
destinationPath: destinationPath, destinationPath: destinationPath,
@ -271,56 +272,55 @@ var fileMoveOrCopy = function (_a) {
if (moved) { if (moved) {
return [2 /*return*/, true]; return [2 /*return*/, true];
} }
return [4 /*yield*/, tryMvdir({ // disable: https://github.com/HaveAGitGat/Tdarr/issues/885
sourcePath: sourcePath, // const mvdird = await tryMvdir({
destinationPath: destinationPath, // sourcePath,
args: args, // destinationPath,
sourceFileSize: sourceFileSize, // args,
})]; // sourceFileSize,
case 3: // });
mvdird = _b.sent(); // if (mvdird) {
if (mvdird) { // return true;
return [2 /*return*/, true]; // }
}
args.jobLog('Failed to move file, trying copy'); args.jobLog('Failed to move file, trying copy');
_b.label = 4; _b.label = 3;
case 4: return [4 /*yield*/, tyNcp({ case 3: return [4 /*yield*/, tyNcp({
sourcePath: sourcePath, sourcePath: sourcePath,
destinationPath: destinationPath, destinationPath: destinationPath,
args: args, args: args,
sourceFileSize: sourceFileSize, sourceFileSize: sourceFileSize,
})]; })];
case 5: case 4:
ncpd = _b.sent(); ncpd = _b.sent();
if (!ncpd) return [3 /*break*/, 8]; if (!ncpd) return [3 /*break*/, 7];
if (!(operation === 'move')) return [3 /*break*/, 7]; if (!(operation === 'move')) return [3 /*break*/, 6];
return [4 /*yield*/, cleanSourceFile({ return [4 /*yield*/, cleanSourceFile({
args: args, args: args,
sourcePath: sourcePath, sourcePath: sourcePath,
})]; })];
case 6: case 5:
_b.sent(); _b.sent();
_b.label = 7; _b.label = 6;
case 7: return [2 /*return*/, true]; case 6: return [2 /*return*/, true];
case 8: return [4 /*yield*/, tryNormalCopy({ case 7: return [4 /*yield*/, tryNormalCopy({
sourcePath: sourcePath, sourcePath: sourcePath,
destinationPath: destinationPath, destinationPath: destinationPath,
args: args, args: args,
sourceFileSize: sourceFileSize, sourceFileSize: sourceFileSize,
})]; })];
case 9: case 8:
copied = _b.sent(); copied = _b.sent();
if (!copied) return [3 /*break*/, 12]; if (!copied) return [3 /*break*/, 11];
if (!(operation === 'move')) return [3 /*break*/, 11]; if (!(operation === 'move')) return [3 /*break*/, 10];
return [4 /*yield*/, cleanSourceFile({ return [4 /*yield*/, cleanSourceFile({
args: args, args: args,
sourcePath: sourcePath, sourcePath: sourcePath,
})]; })];
case 10: case 9:
_b.sent(); _b.sent();
_b.label = 11; _b.label = 10;
case 11: return [2 /*return*/, true]; case 10: return [2 /*return*/, true];
case 12: throw new Error("Failed to ".concat(operation, " file")); case 11: throw new Error("Failed to ".concat(operation, " file"));
} }
}); });
}); });

22
FlowPluginsTs/FlowHelpers/1.0.0/fileMoveOrCopy.ts
Unescape View File

@ -68,6 +68,7 @@ const tryMove = async ({
return true; return true;
}; };
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const tryMvdir = async ({ const tryMvdir = async ({
sourcePath, sourcePath,
destinationPath, destinationPath,
@ -219,16 +220,17 @@ const fileMoveOrCopy = async ({
return true; return true;
} }
const mvdird = await tryMvdir({ // disable: https://github.com/HaveAGitGat/Tdarr/issues/885
sourcePath, // const mvdird = await tryMvdir({
destinationPath, // sourcePath,
args, // destinationPath,
sourceFileSize, // args,
}); // sourceFileSize,
// });
if (mvdird) {
return true; // if (mvdird) {
} // return true;
// }
args.jobLog('Failed to move file, trying copy'); args.jobLog('Failed to move file, trying copy');
} }

Write Preview
Loading…
Cancel
Save