Skip to content

Commit 08673e8

Browse files
authored
Revert "feat(server): separate quality for thumbnail and preview images (immich-app#13006)"
This reverts commit 995f0fd.
1 parent 995f0fd commit 08673e8

17 files changed

+193
-364
lines changed

mobile/openapi/README.md

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mobile/openapi/lib/api.dart

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mobile/openapi/lib/api_client.dart

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mobile/openapi/lib/model/system_config_generated_image_dto.dart

-118
This file was deleted.

mobile/openapi/lib/model/system_config_image_dto.dart

+43-15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

open-api/immich-openapi-specs.json

+21-27
Original file line numberDiff line numberDiff line change
@@ -11654,48 +11654,42 @@
1165411654
],
1165511655
"type": "object"
1165611656
},
11657-
"SystemConfigGeneratedImageDto": {
11657+
"SystemConfigImageDto": {
1165811658
"properties": {
11659-
"format": {
11659+
"colorspace": {
11660+
"$ref": "#/components/schemas/Colorspace"
11661+
},
11662+
"extractEmbedded": {
11663+
"type": "boolean"
11664+
},
11665+
"previewFormat": {
1166011666
"$ref": "#/components/schemas/ImageFormat"
1166111667
},
11662-
"quality": {
11663-
"maximum": 100,
11668+
"previewSize": {
1166411669
"minimum": 1,
1166511670
"type": "integer"
1166611671
},
11667-
"size": {
11672+
"quality": {
11673+
"maximum": 100,
1166811674
"minimum": 1,
1166911675
"type": "integer"
11670-
}
11671-
},
11672-
"required": [
11673-
"format",
11674-
"quality",
11675-
"size"
11676-
],
11677-
"type": "object"
11678-
},
11679-
"SystemConfigImageDto": {
11680-
"properties": {
11681-
"colorspace": {
11682-
"$ref": "#/components/schemas/Colorspace"
11683-
},
11684-
"extractEmbedded": {
11685-
"type": "boolean"
1168611676
},
11687-
"preview": {
11688-
"$ref": "#/components/schemas/SystemConfigGeneratedImageDto"
11677+
"thumbnailFormat": {
11678+
"$ref": "#/components/schemas/ImageFormat"
1168911679
},
11690-
"thumbnail": {
11691-
"$ref": "#/components/schemas/SystemConfigGeneratedImageDto"
11680+
"thumbnailSize": {
11681+
"minimum": 1,
11682+
"type": "integer"
1169211683
}
1169311684
},
1169411685
"required": [
1169511686
"colorspace",
1169611687
"extractEmbedded",
11697-
"preview",
11698-
"thumbnail"
11688+
"previewFormat",
11689+
"previewSize",
11690+
"quality",
11691+
"thumbnailFormat",
11692+
"thumbnailSize"
1169911693
],
1170011694
"type": "object"
1170111695
},

open-api/typescript-sdk/src/fetch-client.ts

+5-7
Original file line numberDiff line numberDiff line change
@@ -1100,16 +1100,14 @@ export type SystemConfigFFmpegDto = {
11001100
transcode: TranscodePolicy;
11011101
twoPass: boolean;
11021102
};
1103-
export type SystemConfigGeneratedImageDto = {
1104-
format: ImageFormat;
1105-
quality: number;
1106-
size: number;
1107-
};
11081103
export type SystemConfigImageDto = {
11091104
colorspace: Colorspace;
11101105
extractEmbedded: boolean;
1111-
preview: SystemConfigGeneratedImageDto;
1112-
thumbnail: SystemConfigGeneratedImageDto;
1106+
previewFormat: ImageFormat;
1107+
previewSize: number;
1108+
quality: number;
1109+
thumbnailFormat: ImageFormat;
1110+
thumbnailSize: number;
11131111
};
11141112
export type JobSettingsDto = {
11151113
concurrency: number;

server/src/config.ts

+10-13
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import {
2020
VideoContainer,
2121
} from 'src/enum';
2222
import { ConcurrentQueueName, QueueName } from 'src/interfaces/job.interface';
23-
import { ImageOutputConfig } from 'src/interfaces/media.interface';
2423

2524
export interface SystemConfig {
2625
ffmpeg: {
@@ -110,8 +109,11 @@ export interface SystemConfig {
110109
template: string;
111110
};
112111
image: {
113-
thumbnail: ImageOutputConfig;
114-
preview: ImageOutputConfig;
112+
thumbnailFormat: ImageFormat;
113+
thumbnailSize: number;
114+
previewFormat: ImageFormat;
115+
previewSize: number;
116+
quality: number;
115117
colorspace: Colorspace;
116118
extractEmbedded: boolean;
117119
};
@@ -257,16 +259,11 @@ export const defaults = Object.freeze<SystemConfig>({
257259
template: '{{y}}/{{y}}-{{MM}}-{{dd}}/{{filename}}',
258260
},
259261
image: {
260-
thumbnail: {
261-
format: ImageFormat.WEBP,
262-
size: 250,
263-
quality: 80,
264-
},
265-
preview: {
266-
format: ImageFormat.JPEG,
267-
size: 1440,
268-
quality: 80,
269-
},
262+
thumbnailFormat: ImageFormat.WEBP,
263+
thumbnailSize: 250,
264+
previewFormat: ImageFormat.JPEG,
265+
previewSize: 1440,
266+
quality: 80,
270267
colorspace: Colorspace.P3,
271268
extractEmbedded: false,
272269
},

0 commit comments

Comments
 (0)