Archives/thumbsup
2
0
Fork 0
mirror of https://github.com/thumbsup/thumbsup synced 2024-11-03 15:40:14 +00:00
Code Issues Projects Releases Wiki Activity

fix(core): gracefully handle missing Exif.Composite.ImageSize

Browse Source 
Fixes #226
This commit is contained in:
Romain 2021-01-10 23:05:13 +01:00
parent c3ca18d97e
commit 59b539e38e
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/model/metadata.js
View File

@ -133,7 +133,7 @@ function makeArray (value) {
function dimensions (exif) { function dimensions (exif) {
// Use the Composite field to avoid having to check all possible tag groups (EXIF, QuickTime, ASF...) // Use the Composite field to avoid having to check all possible tag groups (EXIF, QuickTime, ASF...)
if (!exif.Composite) { if (!exif.Composite || !exif.Composite.ImageSize) {
return { return {
width: null, width: null,
height: null height: null

10
test/model/metadata.spec.js
View File

@ -228,11 +228,19 @@ describe('Metadata', function () {
should(meta.height).eql(600) should(meta.height).eql(600)
}) })
it('defaults to null otherwise', function () { it('defaults to null when there is no Composite data', function () {
const exiftool = fixtures.exiftool() const exiftool = fixtures.exiftool()
const meta = new Metadata(exiftool) const meta = new Metadata(exiftool)
should(meta.width).eql(null) should(meta.width).eql(null)
should(meta.width).eql(null) should(meta.width).eql(null)
}) })
it('defaults to null when there is no ImageSize data', function () {
const exiftool = fixtures.exiftool()
exiftool.Composite = { Other: 'Data' }
const meta = new Metadata(exiftool)
should(meta.width).eql(null)
should(meta.width).eql(null)
})
}) })
}) })