explorigin/gallery
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up image import a bit

Browse Source
This commit is contained in:
Timothy Farrell 2018-01-08 21:21:42 -06:00
parent 80d5c4283a
commit 820e905743
1 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
packages/gallery/src/data/image.js
View File

@ -78,7 +78,7 @@ class ImageSpec extends TypeSpec {
const processImportables = backgroundTask(async function _processImportables(image) {
const { _id, _rev, sizes, digest } = image;
const imageData = await FileType.getFromURL(image.sizes.full);
const imageData = await FileType.getFromURL(sizes.full);
const img = new Image();
const imageProps = await new Promise(resolve => {
@ -93,36 +93,28 @@ const processImportables = backgroundTask(async function _processImportables(ima
const ExifParser = await import('exif-parser');
const buffer = await blobToArrayBuffer(imageData);
try {
const exifData = ExifParser.create(buffer).parse();
const { tags } = exifData;
const originalDate = new Date(
tags.DateTimeOriginal
? new Date(tags.DateTimeOriginal * 1000).toISOString()
: image.originalDate
).toISOString();
const exifData = ExifParser.create(buffer).parse();
const { tags } = exifData;
const originalDate = new Date(
tags.DateTimeOriginal ? new Date(tags.DateTimeOriginal * 1000).toISOString() : image.originalDate
).toISOString();
deepAssign(imageProps, {
originalDate,
width,
height,
orientation: tags.Orientation,
digest,
make: tags.Make,
model: tags.Model,
flash: !!tags.Flash,
iso: tags.ISO,
sizes,
gps: {
latitude: tags.GPSLatitude,
longitude: tags.GPSLongitude,
altitude: tags.GPSAltitude,
heading: tags.GPSImgDirection
}
});
} catch (e) {
error(e);
}
deepAssign(imageProps, {
originalDate,
orientation: tags.Orientation,
digest,
make: tags.Make,
model: tags.Model,
flash: !!tags.Flash,
iso: tags.ISO,
sizes,
gps: {
latitude: tags.GPSLatitude,
longitude: tags.GPSLongitude,
altitude: tags.GPSAltitude,
heading: tags.GPSImgDirection
}
});
}
delete image.importing;