Catch errors from exif-reader (#17527)

This commit is contained in:
Pascal Jufer
2023-02-15 22:37:51 +01:00
committed by GitHub
parent 3c69a14021
commit 89fbac36ce

View File

@@ -161,17 +161,22 @@ export class FilesService extends ItemsService {
xmp?: Record<string, unknown>;
} = {};
if (sharpMetadata.exif) {
const { image, thumbnail, interoperability, ...rest } = exif(sharpMetadata.exif);
if (image) {
fullMetadata.ifd0 = image;
try {
const { image, thumbnail, interoperability, ...rest } = exif(sharpMetadata.exif);
if (image) {
fullMetadata.ifd0 = image;
}
if (thumbnail) {
fullMetadata.ifd1 = thumbnail;
}
if (interoperability) {
fullMetadata.interop = interoperability;
}
Object.assign(fullMetadata, rest);
} catch (err) {
logger.warn(`Couldn't extract EXIF metadata from file`);
logger.warn(err);
}
if (thumbnail) {
fullMetadata.ifd1 = thumbnail;
}
if (interoperability) {
fullMetadata.interop = interoperability;
}
Object.assign(fullMetadata, rest);
}
if (sharpMetadata.icc) {
fullMetadata.icc = parseIcc(sharpMetadata.icc);