tbelway/immich-quadlet
1
0
Fork 0
forked from Cutlery/immich
Code Pull Requests Activity

replace legacy enum

Browse Source
This commit is contained in:
mertalev 2024-03-24 02:31:03 -04:00
parent d451abd96c
commit 7e07b74406
No known key found for this signature in database
GPG Key ID: 9181CD92C0A1C5E3
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/src/dtos/asset-v1.dto.ts
View File

@ -2,6 +2,7 @@ import { ApiProperty } from '@nestjs/swagger';
import { Type } from 'class-transformer'; import { Type } from 'class-transformer';
import { ArrayNotEmpty, IsArray, IsEnum, IsInt, IsNotEmpty, IsString, IsUUID, ValidateNested } from 'class-validator'; import { ArrayNotEmpty, IsArray, IsEnum, IsInt, IsNotEmpty, IsString, IsUUID, ValidateNested } from 'class-validator';
import { UploadFieldName } from 'src/dtos/asset.dto'; import { UploadFieldName } from 'src/dtos/asset.dto';
import { ImageFormat } from 'src/entities/system-config.entity';
import { Optional, ValidateBoolean, ValidateDate, ValidateUUID } from 'src/validation'; import { Optional, ValidateBoolean, ValidateDate, ValidateUUID } from 'src/validation';
export class AssetBulkUploadCheckItem { export class AssetBulkUploadCheckItem {
@ -112,22 +113,17 @@ export class CreateAssetDto {
[UploadFieldName.SIDECAR_DATA]?: any; [UploadFieldName.SIDECAR_DATA]?: any;
} }
export enum GetAssetThumbnailFormatEnum {
JPEG = 'JPEG',
WEBP = 'WEBP',
}
export class GetAssetThumbnailDto { export class GetAssetThumbnailDto {
@Optional() @Optional()
@IsEnum(GetAssetThumbnailFormatEnum) @IsEnum(ImageFormat)
@ApiProperty({ @ApiProperty({
type: String, type: String,
enum: GetAssetThumbnailFormatEnum, enum: ImageFormat,
default: GetAssetThumbnailFormatEnum.WEBP, default: ImageFormat.WEBP,
required: false, required: false,
enumName: 'ThumbnailFormat', enumName: 'ThumbnailFormat',
}) })
format: GetAssetThumbnailFormatEnum = GetAssetThumbnailFormatEnum.WEBP; format: ImageFormat = ImageFormat.WEBP;
} }
export class SearchPropertiesDto { export class SearchPropertiesDto {

8
server/src/services/asset-v1.service.ts
View File

@ -22,12 +22,12 @@ import {
CheckExistingAssetsDto, CheckExistingAssetsDto,
CreateAssetDto, CreateAssetDto,
GetAssetThumbnailDto, GetAssetThumbnailDto,
GetAssetThumbnailFormatEnum,
ServeFileDto, ServeFileDto,
} from 'src/dtos/asset-v1.dto'; } from 'src/dtos/asset-v1.dto';
import { AuthDto } from 'src/dtos/auth.dto'; import { AuthDto } from 'src/dtos/auth.dto';
import { ASSET_CHECKSUM_CONSTRAINT, AssetEntity, AssetType } from 'src/entities/asset.entity'; import { ASSET_CHECKSUM_CONSTRAINT, AssetEntity, AssetType } from 'src/entities/asset.entity';
import { LibraryType } from 'src/entities/library.entity'; import { LibraryType } from 'src/entities/library.entity';
import { ImageFormat } from 'src/entities/system-config.entity';
import { IAccessRepository } from 'src/interfaces/access.interface'; import { IAccessRepository } from 'src/interfaces/access.interface';
import { IAssetRepositoryV1 } from 'src/interfaces/asset-v1.interface'; import { IAssetRepositoryV1 } from 'src/interfaces/asset-v1.interface';
import { IAssetRepository } from 'src/interfaces/asset.interface'; import { IAssetRepository } from 'src/interfaces/asset.interface';
@ -244,15 +244,15 @@ export class AssetServiceV1 {
}; };
} }
private getThumbnailPath(asset: AssetEntity, format: GetAssetThumbnailFormatEnum) { private getThumbnailPath(asset: AssetEntity, format: ImageFormat) {
switch (format) { switch (format) {
case GetAssetThumbnailFormatEnum.WEBP: { case ImageFormat.WEBP: {
if (asset.thumbnailPath) { if (asset.thumbnailPath) {
return asset.thumbnailPath; return asset.thumbnailPath;
} }
this.logger.warn(`WebP thumbnail requested but not found for asset ${asset.id}, falling back to JPEG`); this.logger.warn(`WebP thumbnail requested but not found for asset ${asset.id}, falling back to JPEG`);
} }
case GetAssetThumbnailFormatEnum.JPEG: { case ImageFormat.JPEG: {
if (!asset.previewPath) { if (!asset.previewPath) {
throw new NotFoundException(`No thumbnail found for asset ${asset.id}`); throw new NotFoundException(`No thumbnail found for asset ${asset.id}`);
} }