Skip to content

Commit

Permalink
Expanded try catch around extracting metadata (#10497)
Browse files Browse the repository at this point in the history
* Expanded try catch around extracting metadata

* Run linter

* Added extra try catch block

* Run linter

Co-authored-by: ian <licitdev@gmail.com>
  • Loading branch information
keesvanbemmel and licitdev committed Dec 14, 2021
1 parent 7cf6300 commit 549b9ee
Showing 1 changed file with 14 additions and 9 deletions.
23 changes: 14 additions & 9 deletions api/src/services/files.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,19 @@ export class FilesService extends ItemsService {

if (['image/jpeg', 'image/png', 'image/webp', 'image/gif', 'image/tiff'].includes(payload.type)) {
const buffer = await storage.disk(data.storage).getBuffer(payload.filename_disk);
const meta = await sharp(buffer.content, {}).metadata();

if (meta.orientation && meta.orientation >= 5) {
payload.height = meta.width;
payload.width = meta.height;
} else {
payload.width = meta.width;
payload.height = meta.height;
try {
const meta = await sharp(buffer.content, {}).metadata();

if (meta.orientation && meta.orientation >= 5) {
payload.height = meta.width;
payload.width = meta.height;
} else {
payload.width = meta.width;
payload.height = meta.height;
}
} catch (err: any) {
logger.warn(`Couldn't extract sharp metadata from file`);
logger.warn(err);
}

payload.metadata = {};
Expand All @@ -107,7 +112,7 @@ export class FilesService extends ItemsService {
payload.tags = payload.metadata.iptc.Keywords;
}
} catch (err: any) {
logger.warn(`Couldn't extract metadata from file`);
logger.warn(`Couldn't extract EXIF metadata from file`);
logger.warn(err);
}
}
Expand Down

0 comments on commit 549b9ee

Please sign in to comment.