github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-23 20:18:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Warn instead of crash on failed exif/iptc/icc extraction

Browse Source 
Fixes #3535
This commit is contained in:
rijkvanzanten
2021-01-12 11:10:17 -05:00
parent 326f9f9f1e
commit 7fa977f002
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
api/src/services/files.ts
View File

@@ -12,6 +12,7 @@ import { toArray } from '../utils/to-array';
import { extension } from 'mime-types';
import path from 'path';
import env from '../env';
import logger from '../logger';
export class FilesService extends ItemsService {
constructor(options: AbstractServiceOptions) {
@@ -57,18 +58,32 @@ export class FilesService extends ItemsService {
payload.metadata = {};
if (meta.icc) {
payload.metadata.icc = parseICC(meta.icc);
try {
payload.metadata.icc = parseICC(meta.icc);
} catch (err) {
logger.warn(`Couldn't extract ICC information from file`);
logger.warn(err);
}
}
if (meta.exif) {
payload.metadata.exif = parseEXIF(meta.exif);
try {
payload.metadata.exif = parseEXIF(meta.exif);
} catch (err) {
logger.warn(`Couldn't extract EXIF information from file`);
logger.warn(err);
}
}
if (meta.iptc) {
payload.metadata.iptc = parseIPTC(meta.iptc);
payload.title = payload.title || payload.metadata.iptc.headline;
payload.description = payload.description || payload.metadata.iptc.caption;
try {
payload.metadata.iptc = parseIPTC(meta.iptc);
payload.title = payload.title || payload.metadata.iptc.headline;
payload.description = payload.description || payload.metadata.iptc.caption;
} catch (err) {
logger.warn(`Couldn't extract IPTC information from file`);
logger.warn(err);
}
}
});