High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix: metadata crash (#26327)
Jason Rasmussend004d7e21ba0
diff --git a/server/src/services/metadata.service.ts b/server/src/services/metadata.service.tsindex 8b9db5b376..42a18fa540 100644--- a/server/src/services/metadata.service.ts+++ b/server/src/services/metadata.service.ts@@ -36,6 +36,7 @@ import { mergeTimeZone } from 'src/utils/date';import { mimeTypes } from 'src/utils/mime-types';import { isFaceImportEnabled } from 'src/utils/misc';import { upsertTags } from 'src/utils/tag';+import { Tasks } from 'src/utils/tasks';/** look for a date from these tags (in order) */const EXIF_DATE_TAGS: Array<keyof ImmichTags> = [@@ -307,33 +308,38 @@ export class MetadataService extends BaseService {const assetWidth = isSidewards ? validate(height) : validate(width);const assetHeight = isSidewards ? validate(width) : validate(height);- const promises: Promise<unknown>[] = [- this.assetRepository.update({- id: asset.id,- duration: this.getDuration(exifTags),- localDateTime: dates.localDateTime,- fileCreatedAt: dates.dateTimeOriginal ?? undefined,- fileModifiedAt: stats.mtime,-- // only update the dimensions if they don't already exist- // we don't want to overwrite width/height that are modified by edits- width: asset.width == null ? assetWidth : undefined,- height: asset.height == null ? assetHeight : undefined,- }),- ];-- await this.assetRepository.upsertExif(exifData, { lockedPropertiesBehavior: 'skip' });- await this.applyTagList(asset);+ const tasks = new Tasks();++ tasks.push(+ () =>+ this.assetRepository.update({+ id: asset.id,+ duration: this.getDuration(exifTags),+ localDateTime: dates.localDateTime,+ fileCreatedAt: dates.dateTimeOriginal ?? undefined,+ fileModifiedAt: stats.mtime,++ // only update the dimensions if they don't already exist+ // we don't want to overwrite width/height that are modified by edits+ width: asset.width == null ? assetWidth : undefined,+ height: asset.height == null ? assetHeight : undefined,+ }),+ async () => {+ await this.assetRepository.upsertExif(exifData, { lockedPropertiesBehavior: 'skip' });+ await this.applyTagList(asset);+ },+ );if (this.isMotionPhoto(asset, exifTags)) {- promises.push(this.applyMotionPhotos(asset, exifTags, dates, stats));+ tasks.push(() => this.applyMotionPhotos(asset, exifTags, dates, stats));}if (isFaceImportEnabled(metadata) && this.hasTaggedFaces(exifTags)) {- promises.push(this.applyTaggedFaces(asset, exifTags));+ tasks.push(() => this.applyTaggedFaces(asset, exifTags));}- await Promise.all(promises);+ await tasks.all();+if (exifData.livePhotoCID) {await this.linkLivePhotos(asset, exifData);}diff --git a/server/src/utils/tasks.ts b/server/src/utils/tasks.tsnew file mode 100644index 0000000000..4a8276fc46--- /dev/null+++ b/server/src/utils/tasks.ts@@ -0,0 +1,13 @@+export type Task = () => Promise<unknown> | unknown;++export class Tasks {+ private tasks: Task[] = [];++ push(...tasks: Task[]) {+ this.tasks.push(...tasks);+ }++ async all() {+ await Promise.all(this.tasks.map((item) => item()));+ }+}