Files can be added to templates and managed in a dedicated "Files" view.
Mosaico integration in progress. The files seem to be working for Mosaico.
This commit is contained in:
Tomas Bures
parent
c85f2d4440
commit
b5cdf57f72
23 changed files with 506 additions and 164 deletions
151
models/files.js
151
models/files.js
|
|
@ -6,37 +6,49 @@ const dtHelpers = require('../lib/dt-helpers');
|
|||
const shares = require('./shares');
|
||||
const fs = require('fs-extra-promise');
|
||||
const path = require('path');
|
||||
const interoperableErrors = require('../shared/interoperable-errors');
|
||||
|
||||
const filesDir = path.join(__dirname, '..', 'files');
|
||||
|
||||
const permittedTypes = new Set(['template']);
|
||||
|
||||
function getFilePath(type, entityId, filename) {
|
||||
return path.join(path.join(filesDir, type, id.toString()), filename);
|
||||
return path.join(path.join(filesDir, type, entityId.toString()), filename);
|
||||
}
|
||||
|
||||
function getFilesTable(type) {
|
||||
return 'files_' + type;
|
||||
}
|
||||
|
||||
async function listFilesDTAjax(context, type, entityId, params) {
|
||||
async function listDTAjax(context, type, entityId, params) {
|
||||
enforce(permittedTypes.has(type));
|
||||
await shares.enforceEntityPermission(context, type, entityId, 'edit');
|
||||
await shares.enforceEntityPermission(context, type, entityId, 'manageFiles');
|
||||
return await dtHelpers.ajaxList(
|
||||
params,
|
||||
builder => builder.from(getFilesTable(type)).where({entity: entityId}),
|
||||
['id', 'originalname', 'size', 'created']
|
||||
['id', 'originalname', 'filename', 'size', 'created']
|
||||
);
|
||||
}
|
||||
|
||||
async function list(context, type, entityId) {
|
||||
return await knex.transaction(async tx => {
|
||||
await shares.enforceEntityPermission(context, type, entityId, 'view');
|
||||
return await tx(getFilesTable(type)).where({entity: entityId}).select(['id', 'originalname', 'filename', 'size', 'created']).orderBy('originalname', 'asc');
|
||||
});
|
||||
}
|
||||
|
||||
async function getFileById(context, type, id) {
|
||||
enforce(permittedTypes.has(type));
|
||||
const file = await knex.transaction(async tx => {
|
||||
const file = await knex(getFilesTable(type)).where('id', id).first();
|
||||
await shares.enforceEntityPermissionTx(tx, context, type, file.entity, 'edit');
|
||||
const file = await tx(getFilesTable(type)).where('id', id).first();
|
||||
await shares.enforceEntityPermissionTx(tx, context, type, file.entity, 'manageFiles');
|
||||
return file;
|
||||
});
|
||||
|
||||
if (!file) {
|
||||
throw new interoperableErrors.NotFoundError();
|
||||
}
|
||||
|
||||
return {
|
||||
mimetype: file.mimetype,
|
||||
name: file.originalname,
|
||||
|
|
@ -44,14 +56,18 @@ async function getFileById(context, type, id) {
|
|||
};
|
||||
}
|
||||
|
||||
async function getFileByName(context, type, entityId, name) {
|
||||
async function getFileByFilename(context, type, entityId, name) {
|
||||
enforce(permittedTypes.has(type));
|
||||
const file = await knex.transaction(async tx => {
|
||||
await shares.enforceEntityPermissionTx(tx, context, type, entityId, 'view');
|
||||
const file = await knex(getFilesTable(type)).where({entity: entityId, originalname: name}).first();
|
||||
const file = await tx(getFilesTable(type)).where({entity: entityId, filename: name}).first();
|
||||
return file;
|
||||
});
|
||||
|
||||
if (!file) {
|
||||
throw new interoperableErrors.NotFoundError();
|
||||
}
|
||||
|
||||
return {
|
||||
mimetype: file.mimetype,
|
||||
name: file.originalname,
|
||||
|
|
@ -59,85 +75,114 @@ async function getFileByName(context, type, entityId, name) {
|
|||
};
|
||||
}
|
||||
|
||||
async function createFiles(context, type, entityId, files) {
|
||||
async function createFiles(context, type, entityId, files, dontReplace = false) {
|
||||
enforce(permittedTypes.has(type));
|
||||
if (files.length == 0) {
|
||||
// No files uploaded
|
||||
return {uploaded: 0};
|
||||
}
|
||||
|
||||
const originalNameSet = new Set();
|
||||
const fileEntities = new Array();
|
||||
const filesToMove = new Array();
|
||||
const ignoredFiles = new Array();
|
||||
const fileEntities = [];
|
||||
const filesToMove = [];
|
||||
const ignoredFiles = [];
|
||||
const removedFiles = [];
|
||||
const filesRet = [];
|
||||
|
||||
// Create entities for files
|
||||
for (const file of files) {
|
||||
if (originalNameSet.has(file.originalname)) {
|
||||
// The file has an original name same as another file
|
||||
ignoredFiles.push(file);
|
||||
} else {
|
||||
originalNameSet.add(file.originalname);
|
||||
await knex.transaction(async tx => {
|
||||
await shares.enforceEntityPermissionTx(tx, context, type, entityId, 'manageFiles');
|
||||
|
||||
const fileEntity = {
|
||||
entity: entityId,
|
||||
filename: file.filename,
|
||||
originalname: file.originalname,
|
||||
mimetype: file.mimetype,
|
||||
encoding: file.encoding,
|
||||
size: file.size
|
||||
};
|
||||
|
||||
fileEntities.push(fileEntity);
|
||||
filesToMove.push(file);
|
||||
const existingNamesRows = await tx(getFilesTable(type)).where('entity', entityId).select(['filename', 'originalname']);
|
||||
const existingNameMap = new Map();
|
||||
for (const row of existingNamesRows) {
|
||||
existingNameMap.set(row.originalname, row);
|
||||
}
|
||||
}
|
||||
|
||||
const originalNameArray = Array.from(originalNameSet);
|
||||
const originalNameSet = new Set();
|
||||
|
||||
const removedFiles = await knex.transaction(async tx => {
|
||||
await shares.enforceEntityPermissionTx(tx, context, type, entityId, 'edit');
|
||||
const removedFiles = await knex(getFilesTable(type)).where('entity', entityId).whereIn('originalname', originalNameArray).select(['filename', 'originalname']);
|
||||
// Create entities for files
|
||||
for (const file of files) {
|
||||
const parsedOriginalName = path.parse(file.originalname);
|
||||
let originalName = parsedOriginalName.base;
|
||||
|
||||
if (dontReplace) {
|
||||
let suffix = 1;
|
||||
while (existingNameMap.has(originalName) || originalNameSet.has(originalName)) {
|
||||
originalName = parsedOriginalName.name + '-' + suffix + parsedOriginalName.ext;
|
||||
suffix++;
|
||||
}
|
||||
}
|
||||
|
||||
if (originalNameSet.has(originalName)) {
|
||||
// The file has an original name same as another file
|
||||
ignoredFiles.push(file);
|
||||
|
||||
} else {
|
||||
filesToMove.push(file);
|
||||
|
||||
fileEntities.push({
|
||||
entity: entityId,
|
||||
filename: file.filename,
|
||||
originalname: originalName,
|
||||
mimetype: file.mimetype,
|
||||
encoding: file.encoding,
|
||||
size: file.size
|
||||
});
|
||||
|
||||
filesRet.push({
|
||||
name: file.filename,
|
||||
originalName: originalName,
|
||||
size: file.size,
|
||||
type: file.mimetype,
|
||||
url: `/files/${type}/${entityId}/${file.filename}`
|
||||
});
|
||||
|
||||
if (existingNameMap.has(originalName)) {
|
||||
removedFiles.push(existingNameMap.get(originalName));
|
||||
}
|
||||
}
|
||||
|
||||
originalNameSet.add(originalName);
|
||||
}
|
||||
|
||||
const originalNameArray = Array.from(originalNameSet);
|
||||
await knex(getFilesTable(type)).where('entity', entityId).whereIn('originalname', originalNameArray).del();
|
||||
if(fileEntities){
|
||||
|
||||
if (fileEntities) {
|
||||
await knex(getFilesTable(type)).insert(fileEntities);
|
||||
}
|
||||
return removedFiles;
|
||||
});
|
||||
|
||||
const removedNameSet = new Set();
|
||||
|
||||
// Move new files from upload directory to files directory
|
||||
for(const file of filesToMove){
|
||||
const filePath = getFilePath(entityId, file.filename);
|
||||
for (const file of filesToMove) {
|
||||
const filePath = getFilePath(type, entityId, file.filename);
|
||||
// The names should be unique, so overwrite is disabled
|
||||
// The directory is created if it does not exist
|
||||
// Empty options argument is passed, otherwise fails
|
||||
await fs.move(file.path, filePath, {});
|
||||
}
|
||||
// Remove replaced files from files directory
|
||||
for(const file of removedFiles){
|
||||
removedNameSet.add(file.originalname);
|
||||
for (const file of removedFiles) {
|
||||
const filePath = getFilePath(type, entityId, file.filename);
|
||||
await fs.remove(filePath);
|
||||
}
|
||||
// Remove ignored files from upload directory
|
||||
for(const file of ignoredFiles){
|
||||
for (const file of ignoredFiles) {
|
||||
await fs.remove(file.path);
|
||||
}
|
||||
|
||||
return {
|
||||
uploaded: files.length,
|
||||
added: fileEntities.length - removedNameSet.size,
|
||||
added: fileEntities.length - removedFiles.length,
|
||||
replaced: removedFiles.length,
|
||||
ignored: ignoredFiles.length
|
||||
ignored: ignoredFiles.length,
|
||||
files: filesRet
|
||||
};
|
||||
}
|
||||
|
||||
async function removeFile(context, type, id) {
|
||||
const file = await knex.transaction(async tx => {
|
||||
const file = await knex(getFilesTable(type)).where('id', id).select('entity', 'filename').first();
|
||||
await shares.enforceEntityPermissionTx(tx, context, type, file.entity, 'edit');
|
||||
const file = await tx(getFilesTable(type)).where('id', id).select('entity', 'filename').first();
|
||||
await shares.enforceEntityPermissionTx(tx, context, type, file.entity, 'manageFiles');
|
||||
await tx(getFilesTable(type)).where('id', id).del();
|
||||
return {filename: file.filename, entity: file.entity};
|
||||
});
|
||||
|
|
@ -147,9 +192,11 @@ async function removeFile(context, type, id) {
|
|||
}
|
||||
|
||||
module.exports = {
|
||||
listFilesDTAjax,
|
||||
listDTAjax,
|
||||
list,
|
||||
getFileById,
|
||||
getFileByName,
|
||||
getFileByFilename,
|
||||
createFiles,
|
||||
removeFile
|
||||
removeFile,
|
||||
filesDir
|
||||
};
|
||||
Loading…
Add table
Add a link
Reference in a new issue