Merge branch 'master' into pr/650

This commit is contained in:
HaveAGitGat 2024-06-03 12:09:04 +01:00
commit 7767f05c9a
25 changed files with 341 additions and 159 deletions

View file

@ -1,5 +1,6 @@
import fs from 'fs';
import { getContainer, getFileAbosluteDir, getFileName } from '../../../../FlowHelpers/1.0.0/fileUtils';
import {
fileExists, getContainer, getFileAbosluteDir, getFileName,
} from '../../../../FlowHelpers/1.0.0/fileUtils';
import {
IpluginDetails,
IpluginInputArgs,
@ -57,7 +58,7 @@ const details = (): IpluginDetails => ({
});
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const plugin = (args: IpluginInputArgs): IpluginOutputArgs => {
const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
const lib = require('../../../../../methods/lib')();
// eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign
args.inputs = lib.loadDefaultValues(args.inputs, details);
@ -71,9 +72,9 @@ const plugin = (args: IpluginInputArgs): IpluginOutputArgs => {
fileToCheck = fileToCheck.replace(/\${container}/g, getContainer(args.inputFileObj._id));
fileToCheck = `${directory}/${fileToCheck}`;
let fileExists = false;
if (fs.existsSync(fileToCheck)) {
fileExists = true;
let fileDoesExist = false;
if (await fileExists(fileToCheck)) {
fileDoesExist = true;
args.jobLog(`File exists: ${fileToCheck}`);
} else {
args.jobLog(`File does not exist: ${fileToCheck}`);
@ -81,7 +82,7 @@ const plugin = (args: IpluginInputArgs): IpluginOutputArgs => {
return {
outputFileObj: args.inputFileObj,
outputNumber: fileExists ? 1 : 2,
outputNumber: fileDoesExist ? 1 : 2,
variables: args.variables,
};
};

View file

@ -1,4 +1,4 @@
import { promises as fs } from 'fs';
import { promises as fsp } from 'fs';
import {
getContainer, getFileAbosluteDir, getSubStem,
} from '../../../../FlowHelpers/1.0.0/fileUtils';
@ -188,7 +188,7 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
sourceDir = getFileAbosluteDir(args.inputFileObj._id);
}
let filesInDir = (await fs.readdir(sourceDir))
let filesInDir = (await fsp.readdir(sourceDir))
.map((row) => ({
source: `${sourceDir}/${row}`,
destination: normJoinPath({

View file

@ -1,4 +1,4 @@
import { promises as fs } from 'fs';
import { promises as fsp } from 'fs';
import { getContainer, getFileName, getSubStem } from '../../../../FlowHelpers/1.0.0/fileUtils';
import {
IpluginDetails,
@ -73,7 +73,7 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
const outputDirectory = String(args.inputs.outputDirectory);
const originalFileName = getFileName(args.originalLibraryFile._id);
const originalFileName = getFileName(args.inputFileObj._id);
const newContainer = getContainer(args.inputFileObj._id);
let outputPath = '';
@ -126,7 +126,7 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
args.deps.fsextra.ensureDirSync(outputPath);
await fs.copyFile(args.inputFileObj._id, ouputFilePath);
await fsp.copyFile(args.inputFileObj._id, ouputFilePath);
return {
outputFileObj: {

View file

@ -1,4 +1,4 @@
import { promises as fs } from 'fs';
import { promises as fsp } from 'fs';
import { getContainer, getFileName } from '../../../../FlowHelpers/1.0.0/fileUtils';
import {
IpluginDetails,
@ -37,7 +37,7 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
// eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign
args.inputs = lib.loadDefaultValues(args.inputs, details);
const originalFileName = getFileName(args.originalLibraryFile._id);
const originalFileName = getFileName(args.inputFileObj._id);
const newContainer = getContainer(args.inputFileObj._id);
const outputPath = args.workDir;
@ -67,7 +67,7 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
args.deps.fsextra.ensureDirSync(outputPath);
await fs.copyFile(args.inputFileObj._id, ouputFilePath);
await fsp.copyFile(args.inputFileObj._id, ouputFilePath);
return {
outputFileObj: {

View file

@ -1,4 +1,5 @@
import { promises as fs } from 'fs';
import { promises as fsp } from 'fs';
import {
IpluginDetails,
IpluginInputArgs,
@ -64,21 +65,21 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
if (fileToDelete === 'workingFile') {
args.jobLog(`Deleting working file ${args.inputFileObj._id}`);
await fs.unlink(args.inputFileObj._id);
await fsp.unlink(args.inputFileObj._id);
} else if (fileToDelete === 'originalFile') {
args.jobLog(`Deleting original file ${args.originalLibraryFile._id}`);
await fs.unlink(args.originalLibraryFile._id);
await fsp.unlink(args.originalLibraryFile._id);
}
const fileDir = getFileAbosluteDir(args.originalLibraryFile._id);
if (deleteParentFolderIfEmpty) {
args.jobLog(`Checking if folder ${fileDir} is empty`);
const files = await fs.readdir(fileDir);
const files = await fsp.readdir(fileDir);
if (files.length === 0) {
args.jobLog(`Deleting empty folder ${fileDir}`);
await fs.rmdir(fileDir);
await fsp.rmdir(fileDir);
} else {
args.jobLog(`Folder ${fileDir} is not empty, skipping delete`);
}

View file

@ -65,7 +65,7 @@ const plugin = async (args:IpluginInputArgs):Promise<IpluginOutputArgs> => {
const outputDirectory = String(args.inputs.outputDirectory);
const originalFileName = getFileName(args.originalLibraryFile._id);
const originalFileName = getFileName(args.inputFileObj._id);
const newContainer = getContainer(args.inputFileObj._id);
let outputPath = '';

View file

@ -1,5 +1,7 @@
import { promises as fsp } from 'fs';
import fileMoveOrCopy from '../../../../FlowHelpers/1.0.0/fileMoveOrCopy';
import {
fileExists,
getContainer, getFileAbosluteDir, getFileName,
} from '../../../../FlowHelpers/1.0.0/fileUtils';
import {
@ -32,7 +34,6 @@ const details = (): IpluginDetails => ({
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
const fs = require('fs');
const lib = require('../../../../../methods/lib')();
// eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign
args.inputs = lib.loadDefaultValues(args.inputs, details);
@ -76,11 +77,11 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
// delete original file
if (
fs.existsSync(args.originalLibraryFile._id)
await fileExists(args.originalLibraryFile._id)
&& args.originalLibraryFile._id !== currentPath
) {
args.jobLog(`Deleting original file:${args.originalLibraryFile._id}`);
fs.unlinkSync(args.originalLibraryFile._id);
await fsp.unlink(args.originalLibraryFile._id);
}
await new Promise((resolve) => setTimeout(resolve, 2000));

View file

@ -1,4 +1,4 @@
import { promises as fs } from 'fs';
import { promises as fsp } from 'fs';
import { CLI } from '../../../../FlowHelpers/1.0.0/cliUtils';
import {
IpluginDetails,
@ -99,7 +99,7 @@ const plugin = async (args:IpluginInputArgs):Promise<IpluginOutputArgs> => {
if (presetString.trim() !== '') {
const preset = JSON.parse(presetString);
await fs.writeFile(presetPath, JSON.stringify(preset, null, 2));
await fsp.writeFile(presetPath, JSON.stringify(preset, null, 2));
cliArgs.push('--preset-import-file');
cliArgs.push(presetPath);
cliArgs.push('-Z');

View file

@ -1,4 +1,4 @@
import { promises as fs } from 'fs';
import { promises as fsp } from 'fs';
import { CLI } from '../../../../FlowHelpers/1.0.0/cliUtils';
import {
IpluginDetails,
@ -142,7 +142,7 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
if (useJsonPreset) {
const preset = JSON.parse(presetString);
await fs.writeFile(presetPath, JSON.stringify(preset, null, 2));
await fsp.writeFile(presetPath, JSON.stringify(preset, null, 2));
cliArgs.push('--preset-import-file');
cliArgs.push(presetPath);
cliArgs.push('-Z');

View file

@ -1,4 +1,4 @@
import { promises as fs } from 'fs';
import { promises as fsp } from 'fs';
import {
IpluginDetails,
@ -86,7 +86,7 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
const checkReadWrite = async (location: string) => {
try {
await fs.access(location, fs.constants.R_OK);
await fsp.access(location, fsp.constants.R_OK);
} catch (err) {
args.jobLog(JSON.stringify(err));
if (pauseNodeIfAccessChecksFail) {
@ -97,7 +97,7 @@ const plugin = async (args: IpluginInputArgs): Promise<IpluginOutputArgs> => {
}
try {
await fs.access(location, fs.constants.W_OK);
await fsp.access(location, fsp.constants.W_OK);
} catch (err) {
args.jobLog(JSON.stringify(err));
if (pauseNodeIfAccessChecksFail) {

View file

@ -1,8 +1,10 @@
import { promises as fsp } from 'fs';
import {
IpluginDetails,
IpluginInputArgs,
IpluginOutputArgs,
} from '../../../../FlowHelpers/1.0.0/interfaces/interfaces';
import { fileExists } from '../../../../FlowHelpers/1.0.0/fileUtils';
/* eslint no-plusplus: ["error", { "allowForLoopAfterthoughts": true }] */
const details = ():IpluginDetails => ({
@ -46,21 +48,19 @@ const details = ():IpluginDetails => ({
});
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const plugin = (args:IpluginInputArgs):IpluginOutputArgs => {
const plugin = async (args:IpluginInputArgs):Promise<IpluginOutputArgs> => {
const lib = require('../../../../../methods/lib')();
// eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign
args.inputs = lib.loadDefaultValues(args.inputs, details);
const fs = require('fs');
const oldFile = args.inputFileObj._id;
const newFile = `${args.inputFileObj._id}.tmp`;
if (fs.existsSync(newFile)) {
fs.unlinkSync(newFile);
if (await fileExists(newFile)) {
await fsp.unlink(newFile);
}
fs.copyFileSync(oldFile, newFile);
await fsp.copyFile(oldFile, newFile);
return {
outputFileObj: { _id: newFile },