Multiple small adjustments

make-only-subtitle-default
jeanchristophe.mqt@gmail.com 2 years ago
parent 694ae59f22
commit c21e9594a5

@ -144,10 +144,10 @@ var getId = function (args, arr, arrHost, headers, fileName, refreshType) { retu
}); });
}); }; }); };
var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function () { var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function () {
var lib, refreshed, arr, arr_host, arrHost, absoluteFileDir, fileNames, headers, refreshType, id; var lib, refreshed, arr, arr_host, arrHost, originalFileName, currentFileName, headers, refreshType, id;
var _a, _b, _c, _d, _e, _f; var _a, _b, _c, _d;
return __generator(this, function (_g) { return __generator(this, function (_e) {
switch (_g.label) { switch (_e.label) {
case 0: case 0:
lib = require('../../../../../methods/lib')(); lib = require('../../../../../methods/lib')();
// eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign // eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign
@ -156,11 +156,8 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function
arr = String(args.inputs.arr); arr = String(args.inputs.arr);
arr_host = String(args.inputs.arr_host).trim(); arr_host = String(args.inputs.arr_host).trim();
arrHost = arr_host.endsWith('/') ? arr_host.slice(0, -1) : arr_host; arrHost = arr_host.endsWith('/') ? arr_host.slice(0, -1) : arr_host;
absoluteFileDir = (0, fileUtils_1.getFileAbosluteDir)((_b = (_a = args.originalLibraryFile) === null || _a === void 0 ? void 0 : _a._id) !== null && _b !== void 0 ? _b : ''); originalFileName = path_1.default.join((_b = (_a = args.originalLibraryFile) === null || _a === void 0 ? void 0 : _a._id) !== null && _b !== void 0 ? _b : '');
fileNames = { currentFileName = path_1.default.join((_d = (_c = args.inputFileObj) === null || _c === void 0 ? void 0 : _c._id) !== null && _d !== void 0 ? _d : '');
originalFileName: path_1.default.join(absoluteFileDir, (0, fileUtils_1.getFileName)((_d = (_c = args.originalLibraryFile) === null || _c === void 0 ? void 0 : _c._id) !== null && _d !== void 0 ? _d : '')),
currentFileName: path_1.default.join(absoluteFileDir, (0, fileUtils_1.getFileName)((_f = (_e = args.inputFileObj) === null || _e === void 0 ? void 0 : _e._id) !== null && _f !== void 0 ? _f : '')),
};
headers = { headers = {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'X-Api-Key': String(args.inputs.arr_api_key), 'X-Api-Key': String(args.inputs.arr_api_key),
@ -185,14 +182,14 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function
}; };
args.jobLog('Going to force scan'); args.jobLog('Going to force scan');
args.jobLog("Refreshing ".concat(refreshType.appName, "...")); args.jobLog("Refreshing ".concat(refreshType.appName, "..."));
return [4 /*yield*/, getId(args, arr, arrHost, headers, fileNames.originalFileName, refreshType)]; return [4 /*yield*/, getId(args, arr, arrHost, headers, originalFileName, refreshType)];
case 1: case 1:
id = _g.sent(); id = _e.sent();
if (!(id === -1 && fileNames.currentFileName !== fileNames.originalFileName)) return [3 /*break*/, 3]; if (!(id === -1 && currentFileName !== originalFileName)) return [3 /*break*/, 3];
return [4 /*yield*/, getId(args, arr, arrHost, headers, fileNames.currentFileName, refreshType)]; return [4 /*yield*/, getId(args, arr, arrHost, headers, currentFileName, refreshType)];
case 2: case 2:
id = _g.sent(); id = _e.sent();
_g.label = 3; _e.label = 3;
case 3: case 3:
if (!(id !== -1)) return [3 /*break*/, 5]; if (!(id !== -1)) return [3 /*break*/, 5];
// Using command endpoint to queue a refresh task // Using command endpoint to queue a refresh task
@ -204,10 +201,10 @@ var plugin = function (args) { return __awaiter(void 0, void 0, void 0, function
})]; })];
case 4: case 4:
// Using command endpoint to queue a refresh task // Using command endpoint to queue a refresh task
_g.sent(); _e.sent();
refreshed = true; refreshed = true;
args.jobLog("\u2714 ".concat(refreshType.content, " ").concat(id, " refreshed in ").concat(refreshType.appName, ".")); args.jobLog("\u2714 ".concat(refreshType.content, " ").concat(id, " refreshed in ").concat(refreshType.appName, "."));
_g.label = 5; _e.label = 5;
case 5: return [2 /*return*/, { case 5: return [2 /*return*/, {
outputFileObj: args.inputFileObj, outputFileObj: args.inputFileObj,
outputNumber: refreshed ? 1 : 2, outputNumber: refreshed ? 1 : 2,

@ -1,5 +1,5 @@
import path from 'path'; import path from 'path';
import { getFileAbosluteDir, getFileName } from '../../../../FlowHelpers/1.0.0/fileUtils'; import { getFileName } from '../../../../FlowHelpers/1.0.0/fileUtils';
import { import {
IpluginDetails, IpluginDetails,
IpluginInputArgs, IpluginInputArgs,
@ -79,14 +79,13 @@ interface IParsedRequestResult {
series?: { id: number }, series?: { id: number },
}, },
} }
interface IRefreshDelegates {
getIdFromParseResponse: (parseRequestResult: IParsedRequestResult) => number,
buildRefreshResquestData: (id: number) => string
}
interface IRefreshType { interface IRefreshType {
appName: string, appName: string,
content: string, content: string,
delegates: IRefreshDelegates delegates: {
getIdFromParseResponse: (parseRequestResult: IParsedRequestResult) => number,
buildRefreshResquestData: (id: number) => string
}
} }
const getId = async ( const getId = async (
@ -131,11 +130,8 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
const arr = String(args.inputs.arr); const arr = String(args.inputs.arr);
const arr_host = String(args.inputs.arr_host).trim(); const arr_host = String(args.inputs.arr_host).trim();
const arrHost = arr_host.endsWith('/') ? arr_host.slice(0, -1) : arr_host; const arrHost = arr_host.endsWith('/') ? arr_host.slice(0, -1) : arr_host;
const absoluteFileDir = getFileAbosluteDir(args.originalLibraryFile?._id ?? ''); const originalFileName = path.join(args.originalLibraryFile?._id ?? '');
const fileNames = { const currentFileName = path.join(args.inputFileObj?._id ?? '');
originalFileName: path.join(absoluteFileDir, getFileName(args.originalLibraryFile?._id ?? '')),
currentFileName: path.join(absoluteFileDir, getFileName(args.inputFileObj?._id ?? '')),
};
const headers: IHTTPHeaders = { const headers: IHTTPHeaders = {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'X-Api-Key': String(args.inputs.arr_api_key), 'X-Api-Key': String(args.inputs.arr_api_key),
@ -166,10 +162,10 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
args.jobLog('Going to force scan'); args.jobLog('Going to force scan');
args.jobLog(`Refreshing ${refreshType.appName}...`); args.jobLog(`Refreshing ${refreshType.appName}...`);
let id = await getId(args, arr, arrHost, headers, fileNames.originalFileName, refreshType); let id = await getId(args, arr, arrHost, headers, originalFileName, refreshType);
// Useful in some edge cases // Useful in some edge cases
if (id === -1 && fileNames.currentFileName !== fileNames.originalFileName) { if (id === -1 && currentFileName !== originalFileName) {
id = await getId(args, arr, arrHost, headers, fileNames.currentFileName, refreshType); id = await getId(args, arr, arrHost, headers, currentFileName, refreshType);
} }
// Checking that the file has been found // Checking that the file has been found

Loading…
Cancel
Save