Renamed some methods to clarify the expected behavior

make-only-subtitle-default
jeanchristophe.mqt@gmail.com 2 years ago
parent 5c2d2814a6
commit 3937c799dd

@ -144,17 +144,17 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function
return [4 /*yield*/, args.deps.axios(parseRequestConfig)]; return [4 /*yield*/, args.deps.axios(parseRequestConfig)];
case 1: case 1:
parseRequestResult = _a.sent(); parseRequestResult = _a.sent();
id = delegates.getId(parseRequestResult); id = delegates.getIdFromParseRequestResult(parseRequestResult);
if (!(id !== '-1')) return [3 /*break*/, 6]; if (!(id !== '-1')) return [3 /*break*/, 6];
previewRenameRequestConfig = { previewRenameRequestConfig = {
method: 'get', method: 'get',
url: delegates.getPreviewRenameResquestUrl(id, parseRequestResult), url: delegates.buildPreviewRenameResquestUrl(id, parseRequestResult),
headers: headers, headers: headers,
}; };
return [4 /*yield*/, args.deps.axios(previewRenameRequestConfig)]; return [4 /*yield*/, args.deps.axios(previewRenameRequestConfig)];
case 2: case 2:
previewRenameRequestResult = _a.sent(); previewRenameRequestResult = _a.sent();
fileToRename = delegates.getFileToRename(previewRenameRequestResult); fileToRename = delegates.getFileToRenameFromPreviewRenameRequestResult(previewRenameRequestResult);
if (!(fileToRename !== undefined)) return [3 /*break*/, 4]; if (!(fileToRename !== undefined)) return [3 /*break*/, 4];
pathWithNewName = "".concat((0, fileUtils_1.getFileAbosluteDir)(args.inputFileObj._id), "/").concat((0, fileUtils_1.getFileName)(fileToRename.newPath), ".").concat((0, fileUtils_1.getContainer)(fileToRename.newPath)); pathWithNewName = "".concat((0, fileUtils_1.getFileAbosluteDir)(args.inputFileObj._id), "/").concat((0, fileUtils_1.getFileName)(fileToRename.newPath), ".").concat((0, fileUtils_1.getContainer)(fileToRename.newPath));
return [4 /*yield*/, (0, fileMoveOrCopy_1.default)({ return [4 /*yield*/, (0, fileMoveOrCopy_1.default)({
@ -181,9 +181,9 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function
pathWithNewName = ''; pathWithNewName = '';
if (!(arr === 'radarr')) return [3 /*break*/, 2]; if (!(arr === 'radarr')) return [3 /*break*/, 2];
return [4 /*yield*/, getNewPath({ return [4 /*yield*/, getNewPath({
getId: function (parseRequestResult) { var _a, _b, _c, _d; return String((_d = (_c = (_b = (_a = parseRequestResult.data) === null || _a === void 0 ? void 0 : _a.movie) === null || _b === void 0 ? void 0 : _b.movieFile) === null || _c === void 0 ? void 0 : _c.movieId) !== null && _d !== void 0 ? _d : -1); }, getIdFromParseRequestResult: function (parseRequestResult) { var _a, _b, _c, _d; return String((_d = (_c = (_b = (_a = parseRequestResult.data) === null || _a === void 0 ? void 0 : _a.movie) === null || _b === void 0 ? void 0 : _b.movieFile) === null || _c === void 0 ? void 0 : _c.movieId) !== null && _d !== void 0 ? _d : -1); },
getPreviewRenameResquestUrl: function (id, parseRequestResult) { return "".concat(arrHost, "/api/v3/rename?movieId=").concat(id); }, buildPreviewRenameResquestUrl: function (id, parseRequestResult) { return "".concat(arrHost, "/api/v3/rename?movieId=").concat(id); },
getFileToRename: function (previewRenameRequestResult) { getFileToRenameFromPreviewRenameRequestResult: function (previewRenameRequestResult) {
var _a, _b; var _a, _b;
return (((_b = (_a = previewRenameRequestResult.data) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0) ? return (((_b = (_a = previewRenameRequestResult.data) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0) ?
previewRenameRequestResult.data[0] previewRenameRequestResult.data[0]
@ -197,12 +197,12 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function
if (!(arr === 'sonarr')) return [3 /*break*/, 4]; if (!(arr === 'sonarr')) return [3 /*break*/, 4];
episodeNumber_1 = 0; episodeNumber_1 = 0;
return [4 /*yield*/, getNewPath({ return [4 /*yield*/, getNewPath({
getId: function (parseRequestResult) { var _a, _b, _c; return String((_c = (_b = (_a = parseRequestResult.data) === null || _a === void 0 ? void 0 : _a.series) === null || _b === void 0 ? void 0 : _b.id) !== null && _c !== void 0 ? _c : -1); }, getIdFromParseRequestResult: function (parseRequestResult) { var _a, _b, _c; return String((_c = (_b = (_a = parseRequestResult.data) === null || _a === void 0 ? void 0 : _a.series) === null || _b === void 0 ? void 0 : _b.id) !== null && _c !== void 0 ? _c : -1); },
getPreviewRenameResquestUrl: function (id, parseRequestResult) { buildPreviewRenameResquestUrl: function (id, parseRequestResult) {
episodeNumber_1 = parseRequestResult.data.parsedEpisodeInfo.episodeNumbers[0]; episodeNumber_1 = parseRequestResult.data.parsedEpisodeInfo.episodeNumbers[0];
return "".concat(arrHost, "/api/v3/rename?seriesId=").concat(id, "&seasonNumber=").concat(parseRequestResult.data.parsedEpisodeInfo.seasonNumber); return "".concat(arrHost, "/api/v3/rename?seriesId=").concat(id, "&seasonNumber=").concat(parseRequestResult.data.parsedEpisodeInfo.seasonNumber);
}, },
getFileToRename: function (previewRenameRequestResult) { getFileToRenameFromPreviewRenameRequestResult: function (previewRenameRequestResult) {
var _a, _b; var _a, _b;
return (((_b = (_a = previewRenameRequestResult.data) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0) ? return (((_b = (_a = previewRenameRequestResult.data) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0) ?
previewRenameRequestResult.data.find(function (episodeFile) { var _a, _b; return (((_b = (_a = episodeFile.episodeNumbers) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0) ? episodeFile.episodeNumbers[0] === episodeNumber_1 : false; }) previewRenameRequestResult.data.find(function (episodeFile) { var _a, _b; return (((_b = (_a = episodeFile.episodeNumbers) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0) ? episodeFile.episodeNumbers[0] === episodeNumber_1 : false; })

@ -67,9 +67,9 @@ const details = (): IpluginDetails => ({
}); });
interface IGetNewPathDelegates { interface IGetNewPathDelegates {
getId: (parseRequestResult: any) => string, getIdFromParseRequestResult: (parseRequestResult: any) => string,
getPreviewRenameResquestUrl: (id: string, parseRequestResult: any) => string, buildPreviewRenameResquestUrl: (id: string, parseRequestResult: any) => string,
getFileToRename: (previewRenameRequestResult: any) => any getFileToRenameFromPreviewRenameRequestResult: (previewRenameRequestResult: any) => any
} }
const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => { const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
@ -102,7 +102,7 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
headers, headers,
}; };
const parseRequestResult = await args.deps.axios(parseRequestConfig); const parseRequestResult = await args.deps.axios(parseRequestConfig);
const id = delegates.getId(parseRequestResult); const id = delegates.getIdFromParseRequestResult(parseRequestResult);
// Checking that the file has been found. A file not found might be caused because Radarr/Sonarr hasn't been notified of a file rename (notify plugin missing ?) // Checking that the file has been found. A file not found might be caused because Radarr/Sonarr hasn't been notified of a file rename (notify plugin missing ?)
// or because Radarr/Sonarr has upgraded the movie/serie to another release before the end of the plugin stack execution. // or because Radarr/Sonarr has upgraded the movie/serie to another release before the end of the plugin stack execution.
@ -110,11 +110,11 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
// Using rename endpoint to get ids of all the files that need renaming. // Using rename endpoint to get ids of all the files that need renaming.
const previewRenameRequestConfig = { const previewRenameRequestConfig = {
method: 'get', method: 'get',
url: delegates.getPreviewRenameResquestUrl(id, parseRequestResult), url: delegates.buildPreviewRenameResquestUrl(id, parseRequestResult),
headers, headers,
}; };
const previewRenameRequestResult = await args.deps.axios(previewRenameRequestConfig); const previewRenameRequestResult = await args.deps.axios(previewRenameRequestConfig);
const fileToRename = delegates.getFileToRename(previewRenameRequestResult); const fileToRename = delegates.getFileToRenameFromPreviewRenameRequestResult(previewRenameRequestResult);
// Only if there is a rename to execute // Only if there is a rename to execute
if (fileToRename !== undefined) { if (fileToRename !== undefined) {
@ -138,9 +138,9 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
let pathWithNewName = ''; let pathWithNewName = '';
if (arr === 'radarr') { if (arr === 'radarr') {
pathWithNewName = await getNewPath({ pathWithNewName = await getNewPath({
getId: (parseRequestResult) => String(parseRequestResult.data?.movie?.movieFile?.movieId ?? -1), getIdFromParseRequestResult: (parseRequestResult) => String(parseRequestResult.data?.movie?.movieFile?.movieId ?? -1),
getPreviewRenameResquestUrl: (id, parseRequestResult) => `${arrHost}/api/v3/rename?movieId=${id}`, buildPreviewRenameResquestUrl: (id, parseRequestResult) => `${arrHost}/api/v3/rename?movieId=${id}`,
getFileToRename: (previewRenameRequestResult) => getFileToRenameFromPreviewRenameRequestResult: (previewRenameRequestResult) =>
((previewRenameRequestResult.data?.length ?? 0) > 0) ? ((previewRenameRequestResult.data?.length ?? 0) > 0) ?
previewRenameRequestResult.data[0] previewRenameRequestResult.data[0]
: undefined : undefined
@ -148,12 +148,12 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
} else if (arr === 'sonarr') { } else if (arr === 'sonarr') {
let episodeNumber = 0; let episodeNumber = 0;
pathWithNewName = await getNewPath({ pathWithNewName = await getNewPath({
getId: (parseRequestResult) => String(parseRequestResult.data?.series?.id ?? -1), getIdFromParseRequestResult: (parseRequestResult) => String(parseRequestResult.data?.series?.id ?? -1),
getPreviewRenameResquestUrl: (id, parseRequestResult) => { buildPreviewRenameResquestUrl: (id, parseRequestResult) => {
episodeNumber = parseRequestResult.data.parsedEpisodeInfo.episodeNumbers[0]; episodeNumber = parseRequestResult.data.parsedEpisodeInfo.episodeNumbers[0];
return `${arrHost}/api/v3/rename?seriesId=${id}&seasonNumber=${parseRequestResult.data.parsedEpisodeInfo.seasonNumber}`; return `${arrHost}/api/v3/rename?seriesId=${id}&seasonNumber=${parseRequestResult.data.parsedEpisodeInfo.seasonNumber}`;
}, },
getFileToRename: (previewRenameRequestResult) => getFileToRenameFromPreviewRenameRequestResult: (previewRenameRequestResult) =>
((previewRenameRequestResult.data?.length ?? 0) > 0) ? ((previewRenameRequestResult.data?.length ?? 0) > 0) ?
previewRenameRequestResult.data.find((episodeFile: { episodeNumbers: number[]; }) => ((episodeFile.episodeNumbers?.length ?? 0) > 0) ? episodeFile.episodeNumbers[0] === episodeNumber : false) previewRenameRequestResult.data.find((episodeFile: { episodeNumbers: number[]; }) => ((episodeFile.episodeNumbers?.length ?? 0) > 0) ? episodeFile.episodeNumbers[0] === episodeNumber : false)
: undefined : undefined

Loading…
Cancel
Save