Skip to content

High performance self-hosted photo and video management solution.

fix(server): exiftool largefilesupport only set for the first call (#10167)

Stephen Smith216cca43839d
diff --git a/server/src/repositories/metadata.repository.ts b/server/src/repositories/metadata.repository.ts
index bbffb6aea7..0b32233f6a 100644
--- a/server/src/repositories/metadata.repository.ts
+++ b/server/src/repositories/metadata.repository.ts
@@ -1,6 +1,6 @@
import { Inject, Injectable } from '@nestjs/common';
import { InjectDataSource, InjectRepository } from '@nestjs/typeorm';
-import { DefaultExiftoolArgs, DefaultReadTaskOptions, ExifTool, Tags } from 'exiftool-vendored';
+import { DefaultReadTaskOptions, Tags, exiftool } from 'exiftool-vendored';
import geotz from 'geo-tz';
import { DummyValue, GenerateSql } from 'src/decorators';
import { ExifEntity } from 'src/entities/exif.entity';
@@ -21,23 +21,18 @@ export class MetadataRepository implements IMetadataRepository {
) {
this.logger.setContext(MetadataRepository.name);
}
- private exiftool: ExifTool = this.initExiftool();
async teardown() {
- await this.exiftool.end();
- }
-
- private initExiftool() {
- // Enable exiftool LFS to parse metadata for files larger than 2GB.
- const exiftoolArgs = ['-api', 'largefilesupport=1', ...DefaultExiftoolArgs];
- return new ExifTool({ exiftoolArgs });
+ await exiftool.end();
}
readTags(path: string): Promise<ImmichTags | null> {
- return this.exiftool
+ return exiftool
.read(path, undefined, {
...DefaultReadTaskOptions,
+ // Enable exiftool LFS to parse metadata for files larger than 2GB.
+ optionalArgs: ['-api', 'largefilesupport=1'],
defaultVideosToUTC: true,
backfillTimezones: true,
inferTimezoneFromDatestamps: true,
@@ -53,12 +48,12 @@ export class MetadataRepository implements IMetadataRepository {
}
extractBinaryTag(path: string, tagName: string): Promise<Buffer> {
- return this.exiftool.extractBinaryTagToBuffer(tagName, path);
+ return exiftool.extractBinaryTagToBuffer(tagName, path);
}
async writeTags(path: string, tags: Partial<Tags>): Promise<void> {
try {
- await this.exiftool.write(path, tags, ['-overwrite_original']);
+ await exiftool.write(path, tags, ['-overwrite_original']);
} catch (error) {
this.logger.warn(`Error writing exif data (${path}): ${error}`);
}