summaryrefslogtreecommitdiff
path: root/packages/backend/src/misc/create-temp.ts
diff options
context:
space:
mode:
authorJohann150 <johann.galle@protonmail.com>2022-05-25 09:50:22 +0200
committerGitHub <noreply@github.com>2022-05-25 16:50:22 +0900
commite27c6abaeaf0e0e0be9fba7ffc6fd165474d8592 (patch)
treeece082db386298d8a7d3451a557cda34212cc399 /packages/backend/src/misc/create-temp.ts
parentRefactor widgets and fix lint issues (#8719) (diff)
downloadsharkey-e27c6abaeaf0e0e0be9fba7ffc6fd165474d8592.tar.gz
sharkey-e27c6abaeaf0e0e0be9fba7ffc6fd165474d8592.tar.bz2
sharkey-e27c6abaeaf0e0e0be9fba7ffc6fd165474d8592.zip
refactor: temporary files (#8713)
* simplify temporary files for thumbnails Because only a single file will be written to the directory, creating a separate directory seems unnecessary. If only a temporary file is created, the code from `createTemp` can be reused here as well. * refactor: deduplicate code for temporary files/directories To follow the DRY principle, the same code should not be duplicated across different files. Instead an already existing function is used. Because temporary directories are also create in multiple locations, a function for this is also newly added to reduce duplication. * fix: clean up identicon temp files The temporary files for identicons are not reused and can be deleted after they are fully read. This condition is met when the stream is closed and so the file can be cleaned up using the events API of the stream. * fix: ensure cleanup is called when download fails * fix: ensure cleanup is called in error conditions This covers import/export queue jobs and is mostly just wrapping all code in a try...finally statement where the finally runs the cleanup. * fix: use correct type instead of `any`
Diffstat (limited to 'packages/backend/src/misc/create-temp.ts')
-rw-r--r--packages/backend/src/misc/create-temp.ts13
1 files changed, 11 insertions, 2 deletions
diff --git a/packages/backend/src/misc/create-temp.ts b/packages/backend/src/misc/create-temp.ts
index 04604cf7d0..f07be634fb 100644
--- a/packages/backend/src/misc/create-temp.ts
+++ b/packages/backend/src/misc/create-temp.ts
@@ -1,10 +1,19 @@
import * as tmp from 'tmp';
-export function createTemp(): Promise<[string, any]> {
- return new Promise<[string, any]>((res, rej) => {
+export function createTemp(): Promise<[string, () => void]> {
+ return new Promise<[string, () => void]>((res, rej) => {
tmp.file((e, path, fd, cleanup) => {
if (e) return rej(e);
res([path, cleanup]);
});
});
}
+
+export function createTempDir(): Promise<[string, () => void]> {
+ return new Promise<[string, () => void]>((res, rej) => {
+ tmp.dir((e, path, cleanup) => {
+ if (e) return rej(e);
+ res([path, cleanup]);
+ });
+ });
+}