Skip to content

High performance self-hosted photo and video management solution.

fix: metadata extraction as LensModel can be a float (#30512)

Daniel Dietzler0d7147dceca9
diff --git a/server/src/repositories/metadata.repository.ts b/server/src/repositories/metadata.repository.ts
index 94047bf326..1d504f6c71 100644
--- a/server/src/repositories/metadata.repository.ts
+++ b/server/src/repositories/metadata.repository.ts
@@ -20,7 +20,8 @@ type TagsWithWrongTypes =
| 'TagsList'
| 'Keywords'
| 'HierarchicalSubject'
- | 'ISO';
+ | 'ISO'
+ | 'LensModel';
export interface ImmichTags extends Omit<Tags, TagsWithWrongTypes> {
ContentIdentifier?: string;
@@ -43,6 +44,9 @@ export interface ImmichTags extends Omit<Tags, TagsWithWrongTypes> {
Description?: StringOrNumber;
ImageDescription?: StringOrNumber;
+ // Apparently LensModel can also be a float: https://github.com/immich-app/immich/issues/30492
+ LensModel?: StringOrNumber;
+
// Extended properties for image regions, such as faces
RegionInfo?: {
AppliedToDimensions: {
diff --git a/server/src/services/metadata.service.ts b/server/src/services/metadata.service.ts
index 171dcfe514..37dd92e27d 100644
--- a/server/src/services/metadata.service.ts
+++ b/server/src/services/metadata.service.ts
@@ -117,7 +117,9 @@ const validateRange = (value: number | undefined, min: number, max: number): Non
};
const getLensModel = (exifTags: ImmichTags): string | null => {
- const lensModel = (exifTags.LensID ?? exifTags.LensType ?? exifTags.LensSpec ?? exifTags.LensModel ?? '').trim();
+ const lensModel = String(
+ exifTags.LensID ?? exifTags.LensType ?? exifTags.LensSpec ?? exifTags.LensModel ?? '',
+ ).trim();
if (lensModel === '----') {
return null;
}
diff --git a/server/test/medium/specs/services/metadata.service.spec.ts b/server/test/medium/specs/services/metadata.service.spec.ts
index 6dc66e3ed5..37603520f7 100644
--- a/server/test/medium/specs/services/metadata.service.spec.ts
+++ b/server/test/medium/specs/services/metadata.service.spec.ts
@@ -152,4 +152,23 @@ describe(MetadataService.name, () => {
).resolves.toEqual({ dateTimeOriginal: new Date('4260-03-05T04:04:12.000Z') });
});
});
+
+ it('should handle float lens models (#30492)', async () => {
+ const { sut, ctx } = setup();
+ ctx.getMock(EventRepository).emit.mockResolvedValue();
+ const { filePath } = await createTestFile({ LensModel: 1.8 });
+ const { user } = await ctx.newUser();
+ const { asset } = await ctx.newAsset({ originalPath: filePath, ownerId: user.id });
+ await ctx.newExif({ assetId: asset.id, description: '' });
+
+ await sut.handleMetadataExtraction({ id: asset.id });
+
+ await expect(
+ ctx.database
+ .selectFrom('asset_exif')
+ .where('assetId', '=', asset.id)
+ .select('lensModel')
+ .executeTakeFirstOrThrow(),
+ ).resolves.toEqual({ lensModel: '1.8' });
+ });
});