|
|
@@ -10,7 +10,7 @@ class ImagemagickWrapper {
|
|
|
|
|
|
readMeta(path) {
|
|
|
return this.#threadPool.pushTask(() => new Promise((ok, ko) => {
|
|
|
- imLib.identify(['-format', '%[EXIF:*]Compression=%[compression]\nWidth=%w\nHeight=%h\n', path], (err, stdout) => {
|
|
|
+ imLib.identify(['-format', '%[EXIF:*]Compression=%[compression]\nWidth=%w\nHeight=%h\ndate:modify=%[date:modify]\n', path], (err, stdout) => {
|
|
|
if (err)
|
|
|
return ko(err);
|
|
|
ok(stdout);
|
|
|
@@ -43,6 +43,10 @@ function readMeta(path) {
|
|
|
continue;
|
|
|
var key = line.substr(0, eq_p).replace('/','-'),
|
|
|
value = line.substr(eq_p+1).trim();
|
|
|
+ if (key === 'date:modify') {
|
|
|
+ value = new Date(value);
|
|
|
+ key = "date_modify";
|
|
|
+ }
|
|
|
var p = key.indexOf(':');
|
|
|
if (p !== -1)
|
|
|
key = key.substr(p+1);
|
|
|
@@ -92,7 +96,7 @@ module.exports.parse = async (fileObj, data) => {
|
|
|
result.setExposureProgram(Number.parseInt(imdata.exposureProgram));
|
|
|
result.exposureTime = exifSlash(imdata.exposureTime);
|
|
|
result.exposureTimeStr = imdata.exposureTime || undefined;
|
|
|
- result.dateTime = exifDate(imdata.dateTimeDigitized || imdata.dateTimeOriginal);
|
|
|
+ result.dateTime = exifDate(imdata.dateTimeDigitized || imdata.dateTimeOriginal) || imdata.date_modify;
|
|
|
result.fNumber = exifSlash(imdata.fNumber);
|
|
|
result.focal = exifSlash(imdata.focalLength);
|
|
|
result.lensModel = imdata.lensModel || undefined;
|