Merge 1a48ca3bdf into a02adbb828

e2e/src/api/specs/download.e2e-spec.ts

@@ -1,5 +1,6 @@
 import { AssetMediaResponseDto, LoginResponseDto } from '@immich/sdk';
 import { readFile, writeFile } from 'node:fs/promises';
+import path from 'node:path';
 import { app, tempDir, utils } from 'src/utils';
 import request from 'supertest';
 import { beforeAll, describe, expect, it } from 'vitest';
@@ -43,13 +44,11 @@ describe('/download', () => {
 
       await writeFile(`${tempDir}/archive.zip`, body);
       await utils.unzip(`${tempDir}/archive.zip`, `${tempDir}/archive`);
-      const files = [
+      const files = [{ id: asset1.id }, { id: asset2.id }];
-        { filename: 'example.png', id: asset1.id },
+      for (const { id } of files) {
-        { filename: 'example+1.png', id: asset2.id },
-      ];
-      for (const { id, filename } of files) {
-        const bytes = await readFile(`${tempDir}/archive/${filename}`);
         const asset = await utils.getAssetInfo(admin.accessToken, id);
+        const bytes = await readFile(`${tempDir}/archive/${path.basename(asset.originalPath)}`);
+
         expect(utils.sha1(bytes)).toBe(asset.checksum);
       }
     });

server/src/services/asset-media.service.spec.ts

@@ -515,7 +515,7 @@ describe(AssetMediaService.name, () => {
       await expect(sut.downloadOriginal(authStub.admin, 'asset-1')).resolves.toEqual(
         new ImmichFileResponse({
           path: '/original/path.jpg',
-          fileName: 'asset-id.jpg',
+          fileName: 'path.jpg',
           contentType: 'image/jpeg',
           cacheControl: CacheControl.PrivateWithCache,
         }),

server/src/services/asset-media.service.ts

@@ -1,5 +1,5 @@
 import { BadRequestException, Injectable, InternalServerErrorException, NotFoundException } from '@nestjs/common';
-import { extname } from 'node:path';
+import { basename, extname } from 'node:path';
 import sanitize from 'sanitize-filename';
 import { StorageCore } from 'src/cores/storage.core';
 import { Asset } from 'src/database';
@@ -200,7 +200,7 @@ export class AssetMediaService extends BaseService {
 
     return new ImmichFileResponse({
       path: asset.originalPath,
-      fileName: asset.originalFileName,
+      fileName: basename(asset.originalPath),
       contentType: mimeTypes.lookup(asset.originalPath),
       cacheControl: CacheControl.PrivateWithCache,
     });

server/src/services/download.service.spec.ts

@@ -165,7 +165,7 @@ describe(DownloadService.name, () => {
         stream: archiveMock.stream,
       });
 
-      expect(archiveMock.addFile).toHaveBeenCalledWith('/path/to/realpath.jpg', 'IMG_123.jpg');
+      expect(archiveMock.addFile).toHaveBeenCalledWith('/path/to/realpath.jpg', 'symlink.jpg');
     });
   });
 

server/src/services/download.service.ts

@@ -1,5 +1,5 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
-import { parse } from 'node:path';
+import { basename, parse } from 'node:path';
 import { StorageCore } from 'src/cores/storage.core';
 import { AssetIdsDto } from 'src/dtos/asset.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
@@ -94,13 +94,13 @@ export class DownloadService extends BaseService {
         continue;
       }
 
-      const { originalPath, originalFileName } = asset;
+      const { originalPath } = asset;
 
-      let filename = originalFileName;
+      let filename = basename(originalPath);
       const count = paths[filename] || 0;
       paths[filename] = count + 1;
       if (count !== 0) {
-        const parsedFilename = parse(originalFileName);
+        const parsedFilename = parse(filename);
         filename = `${parsedFilename.name}+${count}${parsedFilename.ext}`;
       }