beenull/immich
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(server): use better algorithm for calculating the duplicate filename (#3061)

Browse source
This commit is contained in:
Jason Rasmussen 2023-07-01 00:44:55 -04:00 committed by GitHub
parent b93bbc9f5d
commit 19cc94e594
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
server/src/domain/asset/asset.service.ts
View file

@ -96,19 +96,17 @@ export class AssetService {
const zip = this.storageRepository.createZipStream();
const assets = await this.assetRepository.getByIds(dto.assetIds);
const paths: Record<string, boolean> = {};
const paths: Record<string, number> = {};
for (const { originalPath, originalFileName } of assets) {
const ext = extname(originalPath);
let filename = `${originalFileName}${ext}`;
for (let i = 0; i < 10_000; i++) {
if (!paths[filename]) {
break;
}
filename = `${originalFileName}+${i + 1}${ext}`;
const count = paths[filename] || 0;
paths[filename] = count + 1;
if (count !== 0) {
filename = `${originalFileName}+${count}${ext}`;
}
paths[filename] = true;
zip.addFile(originalPath, filename);
}