Fix for real

This commit is contained in:
Pitu 2020-07-18 03:37:52 +09:00
parent 6dd7500084
commit b70a75da1a
1 changed files with 7 additions and 8 deletions

View File

@ -154,6 +154,13 @@ class Util {
const thumbName = this.getFileThumbnail(filename);
try {
await jetpack.removeAsync(path.join(__dirname, '..', '..', '..', process.env.UPLOAD_FOLDER, filename));
if (thumbName) {
const thumb = path.join(__dirname, '..', '..', '..', process.env.UPLOAD_FOLDER, 'thumbs', thumbName);
const thumbSquare = path.join(__dirname, '..', '..', '..', process.env.UPLOAD_FOLDER, 'thumbs', 'square', thumbName);
if (await jetpack.existsAsync(thumb)) jetpack.removeAsync(thumb);
if (await jetpack.existsAsync(thumbSquare)) jetpack.removeAsync(thumbSquare);
}
if (deleteFromDB) {
await db.table('files').where('name', filename).delete();
}
@ -161,14 +168,6 @@ class Util {
log.error(`There was an error removing the file < ${filename} >`);
log.error(error);
}
try {
await jetpack.removeAsync(path.join(__dirname, '..', '..', '..', process.env.UPLOAD_FOLDER, 'thumbs', thumbName));
await jetpack.removeAsync(path.join(__dirname, '..', '..', '..', process.env.UPLOAD_FOLDER, 'thumbs', 'square', thumbName));
} catch (error) {
log.error(`There was an error removing the thumbs for file < ${filename} >`);
log.error(error);
}
}
static async deleteAllFilesFromAlbum(id) {