refactor(server): decouple generated images from image formats (#8246)

* rename

thumbnail config

update target paths, fix tests

rename to image settings

replace legacy enum

better typing

update sql

update api

remove config option

fix

* update docs

* update other thumbnail configs in migration

* keep legacy enum for now

* fix jumbled job names

* fix jumbled job names in tests

* rename thumbhash job

* rename dto

* fix tests

* preserve order

* remove unused import

* keep old fields in dto, marked deprecated

* update sql

---------

Co-authored-by: Alex Tran <alex.tran1502@gmail.com>

server/src/dtos/asset-response.dto.ts

@@ -82,7 +82,7 @@ export function mapAsset(entity: AssetEntity, options: AssetMapOptions = {}): As
       type: entity.type,
       thumbhash: entity.thumbhash?.toString('base64') ?? null,
       localDateTime: entity.localDateTime,
-      resized: !!entity.resizePath,
+      resized: !!entity.previewPath,
       duration: entity.duration ?? '0:00:00.00000',
       livePhotoVideoId: entity.livePhotoVideoId,
       hasMetadata: false,
@@ -100,7 +100,7 @@ export function mapAsset(entity: AssetEntity, options: AssetMapOptions = {}): As
     type: entity.type,
     originalPath: entity.originalPath,
     originalFileName: entity.originalFileName,
-    resized: !!entity.resizePath,
+    resized: !!entity.previewPath,
     thumbhash: entity.thumbhash?.toString('base64') ?? null,
     fileCreatedAt: entity.fileCreatedAt,
     fileModifiedAt: entity.fileModifiedAt,

server/src/dtos/search.dto.ts

@@ -163,13 +163,25 @@ export class MetadataSearchDto extends BaseSearchDto {
   @IsString()
   @IsNotEmpty()
   @Optional()
+  @ApiProperty({ deprecated: true })
   resizePath?: string;
 
   @IsString()
   @IsNotEmpty()
   @Optional()
+  @ApiProperty({ deprecated: true })
   webpPath?: string;
 
+  @IsString()
+  @IsNotEmpty()
+  @Optional()
+  previewPath?: string;
+
+  @IsString()
+  @IsNotEmpty()
+  @Optional()
+  thumbnailPath?: string;
+
   @IsString()
   @IsNotEmpty()
   @Optional()

server/src/dtos/system-config.dto.ts

@@ -22,6 +22,7 @@ import {
   AudioCodec,
   CQMode,
   Colorspace,
+  ImageFormat,
   LogLevel,
   SystemConfig,
   ToneMapping,
@@ -385,18 +386,26 @@ export class SystemConfigThemeDto {
   customCss!: string;
 }
 
-class SystemConfigThumbnailDto {
-  @IsInt()
-  @Min(1)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  webpSize!: number;
+class SystemConfigImageDto {
+  @IsEnum(ImageFormat)
+  @ApiProperty({ enumName: 'ImageFormat', enum: ImageFormat })
+  thumbnailFormat!: ImageFormat;
 
   @IsInt()
   @Min(1)
   @Type(() => Number)
   @ApiProperty({ type: 'integer' })
-  jpegSize!: number;
+  thumbnailSize!: number;
+
+  @IsEnum(ImageFormat)
+  @ApiProperty({ enumName: 'ImageFormat', enum: ImageFormat })
+  previewFormat!: ImageFormat;
+
+  @IsInt()
+  @Min(1)
+  @Type(() => Number)
+  @ApiProperty({ type: 'integer' })
+  previewSize!: number;
 
   @IsInt()
   @Min(1)
@@ -480,10 +489,10 @@ export class SystemConfigDto implements SystemConfig {
   @IsObject()
   job!: SystemConfigJobDto;
 
-  @Type(() => SystemConfigThumbnailDto)
+  @Type(() => SystemConfigImageDto)
   @ValidateNested()
   @IsObject()
-  thumbnail!: SystemConfigThumbnailDto;
+  image!: SystemConfigImageDto;
 
   @Type(() => SystemConfigTrashDto)
   @ValidateNested()