Docker/planka
Docker/planka
1
0
Fork 0
mirror of https://github.com/plankanban/planka.git synced 2025-07-18 20:59:44 +02:00
Code Issues Releases Activity

ref: Rename folder to dir for consistency

Browse source
This commit is contained in:
Maksim Eltyshev 2024-11-12 17:07:04 +01:00
parent 917dcf31cf
commit 9794919fd2
8 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/api/helpers/attachments/delete-one.js
View file

@ -50,7 +50,7 @@ module.exports = {
const fileManager = sails.hooks['file-manager'].getInstance();
try {
await fileManager.deleteFolder(
await fileManager.deleteDir(
`${sails.config.custom.attachmentsPathSegment}/${attachment.dirname}`,
);
} catch (error) {

6
server/api/helpers/attachments/process-uploaded-file.js
View file

@ -16,12 +16,12 @@ module.exports = {
const fileManager = sails.hooks['file-manager'].getInstance();
const dirname = uuid();
const folderPathSegment = `${sails.config.custom.attachmentsPathSegment}/${dirname}`;
const dirPathSegment = `${sails.config.custom.attachmentsPathSegment}/${dirname}`;
const filename = filenamify(inputs.file.filename);
const filePath = await fileManager.move(
inputs.file.fd,
`${folderPathSegment}/${filename}`,
`${dirPathSegment}/${filename}`,
inputs.file.type,
);
@ -64,7 +64,7 @@ module.exports = {
.toBuffer();
await fileManager.save(
`${folderPathSegment}/thumbnails/cover-256.${thumbnailsExtension}`,
`${dirPathSegment}/thumbnails/cover-256.${thumbnailsExtension}`,
resizeBuffer,
inputs.file.type,
);

8
server/api/helpers/projects/process-uploaded-background-image-file.js
View file

@ -33,7 +33,7 @@ module.exports = {
const fileManager = sails.hooks['file-manager'].getInstance();
const dirname = uuid();
const folderPathSegment = `${sails.config.custom.projectBackgroundImagesPathSegment}/${dirname}`;
const dirPathSegment = `${sails.config.custom.projectBackgroundImagesPathSegment}/${dirname}`;
let { width, pageHeight: height = metadata.height } = metadata;
if (metadata.orientation && metadata.orientation > 4) {
@ -46,7 +46,7 @@ module.exports = {
const originalBuffer = await image.toBuffer();
await fileManager.save(
`${folderPathSegment}/original.${extension}`,
`${dirPathSegment}/original.${extension}`,
originalBuffer,
inputs.file.type,
);
@ -64,7 +64,7 @@ module.exports = {
.toBuffer();
await fileManager.save(
`${folderPathSegment}/cover-336.${extension}`,
`${dirPathSegment}/cover-336.${extension}`,
cover336Buffer,
inputs.file.type,
);
@ -72,7 +72,7 @@ module.exports = {
console.warn(error1.stack); // eslint-disable-line no-console
try {
fileManager.deleteFolder(folderPathSegment);
fileManager.deleteDir(dirPathSegment);
} catch (error2) {
console.warn(error2.stack); // eslint-disable-line no-console
}

2
server/api/helpers/projects/update-one.js
View file

@ -86,7 +86,7 @@ module.exports = {
const fileManager = sails.hooks['file-manager'].getInstance();
try {
await fileManager.deleteFolder(
await fileManager.deleteDir(
`${sails.config.custom.projectBackgroundImagesPathSegment}/${inputs.record.backgroundImage.dirname}`,
);
} catch (error) {

8
server/api/helpers/users/process-uploaded-avatar-file.js
View file

@ -33,7 +33,7 @@ module.exports = {
const fileManager = sails.hooks['file-manager'].getInstance();
const dirname = uuid();
const folderPathSegment = `${sails.config.custom.userAvatarsPathSegment}/${dirname}`;
const dirPathSegment = `${sails.config.custom.userAvatarsPathSegment}/${dirname}`;
let { width, pageHeight: height = metadata.height } = metadata;
if (metadata.orientation && metadata.orientation > 4) {
@ -46,7 +46,7 @@ module.exports = {
const originalBuffer = await image.toBuffer();
await fileManager.save(
`${folderPathSegment}/original.${extension}`,
`${dirPathSegment}/original.${extension}`,
originalBuffer,
inputs.file.type,
);
@ -64,7 +64,7 @@ module.exports = {
.toBuffer();
await fileManager.save(
`${folderPathSegment}/square-100.${extension}`,
`${dirPathSegment}/square-100.${extension}`,
square100Buffer,
inputs.file.type,
);
@ -72,7 +72,7 @@ module.exports = {
console.warn(error1.stack); // eslint-disable-line no-console
try {
fileManager.deleteFolder(folderPathSegment);
fileManager.deleteDir(dirPathSegment);
} catch (error2) {
console.warn(error2.stack); // eslint-disable-line no-console
}

2
server/api/helpers/users/update-one.js
View file

@ -102,7 +102,7 @@ module.exports = {
const fileManager = sails.hooks['file-manager'].getInstance();
try {
await fileManager.deleteFolder(
await fileManager.deleteDir(
`${sails.config.custom.userAvatarsPathSegment}/${inputs.record.avatar.dirname}`,
);
} catch (error) {

10
server/api/hooks/file-manager/LocalFileManager.js
View file

@ -12,10 +12,10 @@ class LocalFileManager {
async move(sourceFilePath, filePathSegment) {
const { dir, base } = path.parse(filePathSegment);
const folderPath = buildPath(dir);
const filePath = path.join(folderPath, base);
const dirPath = buildPath(dir);
const filePath = path.join(dirPath, base);
await fs.promises.mkdir(folderPath);
await fs.promises.mkdir(dirPath);
await fse.move(sourceFilePath, filePath);
return filePath;
@ -38,8 +38,8 @@ class LocalFileManager {
}
// eslint-disable-next-line class-methods-use-this
async deleteFolder(folderPathSegment) {
await rimraf(buildPath(folderPathSegment));
async deleteDir(dirPathSegment) {
await rimraf(buildPath(dirPathSegment));
}
// eslint-disable-next-line class-methods-use-this

4
server/api/hooks/file-manager/S3FileManager.js
View file

@ -45,10 +45,10 @@ class S3FileManager {
return result.Body;
}
async deleteFolder(folderPathSegment) {
async deleteDir(dirPathSegment) {
const listObjectsCommand = new ListObjectsV2Command({
Bucket: sails.config.custom.s3Bucket,
Prefix: folderPathSegment,
Prefix: dirPathSegment,
});
const result = await this.client.send(listObjectsCommand);