github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix name issue on file upload

Browse Source
This commit is contained in:
rijkvanzanten
2020-07-27 17:51:12 -04:00
parent aee96fb0de
commit f6e9baa73a
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/routes/files.ts
View File

@@ -46,7 +46,6 @@ const multipartHandler = (operation: 'create' | 'update') =>
payload = {
...payload,
filename_disk: filename,
filename_download: filename,
type: mimetype,
};
@@ -142,10 +141,8 @@ router.patch(
'/:pk',
sanitizeQuery,
asyncHandler(async (req, res, next) => {
let file: Item;
if (req.is('multipart/form-data')) {
file = await multipartHandler('update')(req, res, next);
return multipartHandler('update')(req, res, next);
} else {
const pk = await FilesService.updateFile(req.params.pk, req.body, {
role: req.role,
@@ -154,13 +151,14 @@ router.patch(
userAgent: req.get('user-agent'),
user: req.user,
});
file = await FilesService.readFile(pk, req.sanitizedQuery, {
const file = await FilesService.readFile(pk, req.sanitizedQuery, {
role: req.role,
admin: req.admin,
});
}
return res.status(200).json({ data: file || null });
return res.status(200).json({ data: file || null });
}
})
);

24
src/services/files.ts
View File

@@ -26,6 +26,17 @@ export const createFile = async (
payload.filename_disk = payload.id + path.extname(payload.filename_disk);
/**
* @note
* We save a subset first. This allows the permissions check to run and the file to be created with
* proper accountability and revisions.
* Afterwards, we'll save the file to disk. During this process, we extract the metadata of the
* file itself. After the file is saved to disk, we'll update the just created item with the
* updated values to ensure we save the filesize etc. We explicitly save this without accountability
* in order to prevent update permissions to kick in and to pervent an extra revision from being created
*/
const pk = await ItemsService.createItem('directus_files', payload, accountability);
const pipeline = sharp();
if (payload.type?.startsWith('image')) {
@@ -52,9 +63,12 @@ export const createFile = async (
});
}
const pk = await ItemsService.createItem('directus_files', payload, accountability);
if (!payload.title) {
payload.title = payload.id;
}
await storage.disk(data.storage).put(payload.filename_disk, stream.pipe(pipeline));
await ItemsService.updateItem('directus_files', pk, payload);
return pk;
};
@@ -82,6 +96,11 @@ export const updateFile = async (
* Handle changes in storage adapter -> going from local to S3 needs to delete from one, upload to the other
*/
/**
* @TODO
* Remove old thumbnails
*/
/**
* @TODO
* Extract metadata here too
@@ -107,7 +126,10 @@ export const deleteFile = async (pk: string, accountability: Accountability) =>
.from('directus_files')
.where({ id: pk })
.first();
/** @todo delete thumbnails here. should be able to use storage.disk().flatList(prefix: string) */
const { wasDeleted } = await storage.disk(file.storage).delete(file.filename_disk);
logger.info(`File ${file.filename_download} deleted: ${wasDeleted}`);
await database.delete().from('directus_files').where({ id: pk });
};