helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2025-11-14 17:36:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fixed duplicated filename on upload

Browse source
This commit is contained in:
Alex 2022-04-05 14:57:54 -05:00 • committed by GitHub
parent b6579cd38e
commit b74ad69288
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 14 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

20
server/src/config/multer-option.config.ts
View file

@ -5,10 +5,8 @@ import { diskStorage } from 'multer';
import { extname } from 'path';
import { Request } from 'express';
import { APP_UPLOAD_LOCATION } from '../constants/upload_location.constant';
export const multerConfig = {
dest: APP_UPLOAD_LOCATION,
};
import { randomUUID } from 'crypto';
import { CreateAssetDto } from '../api-v1/asset/dto/create-asset.dto';
export const multerOption: MulterOptions = {
fileFilter: (req: Request, file: any, cb: any) => {
@ -21,7 +19,11 @@ export const multerOption: MulterOptions = {
storage: diskStorage({
destination: (req: Request, file: Express.Multer.File, cb: any) => {
const uploadPath = multerConfig.dest;
const uploadPath = APP_UPLOAD_LOCATION;
const fileInfo = req.body as CreateAssetDto;
const yearInfo = new Date(fileInfo.createdAt).getFullYear();
const monthInfo = new Date(fileInfo.createdAt).getMonth();
if (file.fieldname == 'assetData') {
const originalUploadFolder = `${uploadPath}/${req.user['id']}/original/${req.body['deviceId']}`;
@ -30,6 +32,7 @@ export const multerOption: MulterOptions = {
mkdirSync(originalUploadFolder, { recursive: true });
}
// Save original to disk
cb(null, originalUploadFolder);
} else if (file.fieldname == 'thumbnailData') {
const thumbnailUploadFolder = `${uploadPath}/${req.user['id']}/thumb/${req.body['deviceId']}`;
@ -38,17 +41,18 @@ export const multerOption: MulterOptions = {
mkdirSync(thumbnailUploadFolder, { recursive: true });
}
// Save thumbnail to disk
cb(null, thumbnailUploadFolder);
}
},
filename: (req: Request, file: Express.Multer.File, cb: any) => {
// console.log(req, file);
const fileNameUUID = randomUUID();
if (file.fieldname == 'assetData') {
cb(null, `${file.originalname.split('.')[0]}${req.body['fileExtension']}`);
cb(null, `${fileNameUUID}${req.body['fileExtension'].toLowerCase()}`);
} else if (file.fieldname == 'thumbnailData') {
cb(null, `${file.originalname.split('.')[0]}.jpeg`);
cb(null, `${fileNameUUID}.jpeg`);
}
},
}),