self-hosted/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-12-13 11:54:52 +02:00
Code Issues Releases Activity

feat(server): specify names for thumbnail files (#14425)

Browse Source
This commit is contained in:
Eli Gao 2024-12-02 03:21:08 +08:00 committed by GitHub
parent 56d2309122
commit 4eb7758f56
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/services/asset-media.service.spec.ts
View File

@ -571,6 +571,7 @@ describe(AssetMediaService.name, () => {
path: '/path/to/preview.jpg',
cacheControl: CacheControl.PRIVATE_WITH_CACHE,
contentType: 'image/jpeg',
fileName: 'asset-id_thumbnail.jpg',
}),
);
});
@ -585,6 +586,7 @@ describe(AssetMediaService.name, () => {
path: assetStub.image.files[0].path,
cacheControl: CacheControl.PRIVATE_WITH_CACHE,
contentType: 'image/jpeg',
fileName: 'asset-id_preview.jpg',
}),
);
});
@ -599,6 +601,7 @@ describe(AssetMediaService.name, () => {
path: assetStub.image.files[1].path,
cacheControl: CacheControl.PRIVATE_WITH_CACHE,
contentType: 'application/octet-stream',
fileName: 'asset-id_thumbnail.ext',
}),
);
});

6
server/src/services/asset-media.service.ts
View File

@ -27,7 +27,7 @@ import { AuthRequest } from 'src/middleware/auth.guard';
import { BaseService } from 'src/services/base.service';
import { requireUploadAccess } from 'src/utils/access';
import { asRequest, getAssetFiles, onBeforeLink } from 'src/utils/asset.util';
import { ImmichFileResponse } from 'src/utils/file';
import { getFilenameExtension, getFileNameWithoutExtension, ImmichFileResponse } from 'src/utils/file';
import { mimeTypes } from 'src/utils/mime-types';
import { fromChecksum } from 'src/utils/request';
import { QueryFailedError } from 'typeorm';
@ -217,8 +217,12 @@ export class AssetMediaService extends BaseService {
if (!filepath) {
throw new NotFoundException('Asset media not found');
}
let fileName = getFileNameWithoutExtension(asset.originalFileName);
fileName += `_${size}`;
fileName += getFilenameExtension(filepath);
return new ImmichFileResponse({
fileName,
path: filepath,
contentType: mimeTypes.lookup(filepath),
cacheControl: CacheControl.PRIVATE_WITH_CACHE,

4
server/src/utils/file.ts
View File

@ -24,6 +24,7 @@ export class ImmichFileResponse {
public readonly path!: string;
public readonly contentType!: string;
public readonly cacheControl!: CacheControl;
public readonly fileName?: string;
constructor(response: ImmichFileResponse) {
Object.assign(this, response);
@ -56,6 +57,9 @@ export const sendFile = async (
}
res.header('Content-Type', file.contentType);
if (file.fileName) {
res.header('Content-Disposition', `inline; filename="${file.fileName}"`);
}
const options: SendFileOptions = { dotfiles: 'allow' };
if (!isAbsolute(file.path)) {