KevinMidboe/immich
1
0
Fork 0
mirror of https://github.com/KevinMidboe/immich.git synced 2025-10-29 17:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(server): add originalFileName to asset table (#2231)

Browse Source
This commit is contained in:
Alex
2023-04-11 05:23:39 -05:00
committed by GitHub
parent db628cec11
commit a1a62b00a0
24 changed files with 143 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/libs/domain/src/asset/response-dto/asset-response.dto.ts
View File

@@ -13,6 +13,7 @@ export class AssetResponseDto {
@ApiProperty({ enumName: 'AssetTypeEnum', enum: AssetType })
type!: AssetType;
originalPath!: string;
originalFileName!: string;
resizePath!: string | null;
fileCreatedAt!: string;
fileModifiedAt!: string;
@@ -36,6 +37,7 @@ export function mapAsset(entity: AssetEntity): AssetResponseDto {
deviceId: entity.deviceId,
type: entity.type,
originalPath: entity.originalPath,
originalFileName: entity.originalFileName,
resizePath: entity.resizePath,
fileCreatedAt: entity.fileCreatedAt,
fileModifiedAt: entity.fileModifiedAt,
@@ -60,6 +62,7 @@ export function mapAssetWithoutExif(entity: AssetEntity): AssetResponseDto {
deviceId: entity.deviceId,
type: entity.type,
originalPath: entity.originalPath,
originalFileName: entity.originalFileName,
resizePath: entity.resizePath,
fileCreatedAt: entity.fileCreatedAt,
fileModifiedAt: entity.fileModifiedAt,

2
server/libs/domain/src/asset/response-dto/exif-response.dto.ts
View File

@@ -4,7 +4,6 @@ import { ApiProperty } from '@nestjs/swagger';
export class ExifResponseDto {
make?: string | null = null;
model?: string | null = null;
imageName?: string | null = null;
exifImageWidth?: number | null = null;
exifImageHeight?: number | null = null;
@@ -30,7 +29,6 @@ export function mapExif(entity: ExifEntity): ExifResponseDto {
return {
make: entity.make,
model: entity.model,
imageName: entity.imageName,
exifImageWidth: entity.exifImageWidth,
exifImageHeight: entity.exifImageHeight,
fileSizeInByte: entity.fileSizeInByte ? parseInt(entity.fileSizeInByte.toString()) : null,

4
server/libs/domain/src/storage-template/storage-template.service.ts
View File

@@ -26,7 +26,7 @@ export class StorageTemplateService {
const { asset } = data;
try {
const filename = asset.exifInfo?.imageName || asset.id;
const filename = asset.originalFileName || asset.id;
await this.moveAsset(asset, filename);
// move motion part of live photo
@@ -56,7 +56,7 @@ export class StorageTemplateService {
for (const asset of assets) {
const livePhotoParentAsset = livePhotoMap[asset.id];
// TODO: remove livePhoto specific stuff once upload is fixed
const filename = asset.exifInfo?.imageName || livePhotoParentAsset?.exifInfo?.imageName || asset.id;
const filename = asset.originalFileName || livePhotoParentAsset?.originalFileName || asset.id;
await this.moveAsset(asset, filename);
}