tweaking...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>

Archive/README.md

@@ -154,6 +154,6 @@ Leading `"-"` indicates a not fully sorted shoot.
 - <date> - <info>/
 ```
 
-This is the defailt as creatrd by `sync-flash.sh`, renaming (removing the leading `"- "`) should be done by the user.
+This is the default as created by `sync-flash.sh`, renaming (removing the leading `"- "`) should be done by the user.
 
 

Archive/media/README.md

@@ -1,5 +1,4 @@
-Base photo archive directory
+# Base photo archive directory
-----------------------------
 
 This tree is created based on the specification from:
 	https://github.com/flynx/ImageGrid/blob/master/Archive/README.md

Archive/media/img/my/work/compress-archive.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # TODO make this runnable from anywhere...
 #	- prepend paths with './' only if local/relative

Archive/media/img/my/work/process-archive.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 #######################################################################
 #

Archive/media/img/my/work/sync-flash.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 VERSION=1.0
 

Archive/media/img/my/work/update-exif.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 
 

Viewer/features/metadata.js

@@ -113,6 +113,9 @@ var MetadataReaderActions = actions.Actions({
 			- force is true
 
 
+		NOTE: this will read metadata from both the image file as well as sidecar 
+			(xmp) files, if available
+		NOTE: sidecar metadata fields take precedence over image metadata.
 		NOTE: also see: .cacheMetadata(..)
 		`,
 		core.sessionQueueHandler('Read image metadata', 
@@ -135,14 +138,17 @@ var MetadataReaderActions = actions.Actions({
 				if(!image && !img){
 					return false }
 
+				if(!force 
+						&& (img.metadata || {}).ImageGridMetadata == 'full'){
+					return Promise.resolve(img.metadata) }
+
 				//var full_path = path.normalize(img.base_path +'/'+ img.path)
 				var full_path = this.getImagePath(gid)
 
-				return new Promise(function(resolve, reject){
-					if(!force 
-							&& (img.metadata || {}).ImageGridMetadata == 'full'){
-						return resolve(img.metadata) }
 
+				var readers = []
+				// main image...
+				readers.push(new Promise(function(resolve, reject){
 					fs.readFile(full_path, function(err, file){
 						if(err){
 							return reject(err) }
@@ -157,36 +163,57 @@ var MetadataReaderActions = actions.Actions({
 							img.ctime = stat.ctime
 							img.birthtime = stat.birthtime
 
-							img.size = stat.size
+							img.size = stat.size }
-						}
 
 						// read image metadata...
 						exiftool.metadata(file, function(err, data){
 							if(err){
 								reject(err)
-
 							} else if(data.error){
 								reject(data)
-
 							} else {
-								// convert to a real dict...
+								resolve(data) } }) }) }) ) 
-								// NOTE: exiftool appears to return an array 
+				// XMP sidecar files...
-								// 		object rather than an actual dict/object
+				// NOTE: sidecar files take precedence over image metadata...
-								// 		and that is not JSON compatible....
+				for(var ext of ['xmp', 'XMP']){
-								that.images[gid].metadata =
+					var xmp_path = full_path.replace(/\.[a-zA-Z0-9]*$/, '.'+ ext)
-									Object.assign(
+					if(fs.existsSync(xmp_path)){
-										// XXX do we need to update or overwrite??
+						readers.push(new Promise(function(resolve, reject){
-										that.images[gid].metadata || {},
+							fs.readFile(xmp_path, function(err, file){
-										data,
+								if(err){
-										{
+									// XXX log error...
-											ImageGridMetadataReader: 'exiftool/ImageGrid',
+									resolve({}) }
-											// mark metadata as full read...
+								exiftool.metadata(file, function(err, data){
-											ImageGridMetadata: 'full',
+									if(err){
-										})
+										// XXX log error...
-								that.markChanged 
+										resolve({})
-									&& that.markChanged('images', [gid]) }
+									} else if(data.error){
+										// XXX log error...
+										resolve({})
+									} else {
+										console.log("@@@@", data)
+										resolve(data) } }) }) }))
+						break } }
 
-							resolve(data) }) }) }) })],
+			// merge the data...
+			return Promise.all(readers)
+				.then(function(data){
+					// convert to a real dict...
+					// NOTE: exiftool appears to return an array 
+					// 		object rather than an actual dict/object
+					// 		and that is not JSON compatible....
+					that.images[gid].metadata =
+						Object.assign(
+							// XXX do we need to update or overwrite??
+							that.images[gid].metadata || {},
+							...data,
+							{
+								ImageGridMetadataReader: 'exiftool/ImageGrid',
+								// mark metadata as full read...
+								ImageGridMetadata: 'full',
+							})
+					that.markChanged 
+						&& that.markChanged('images', [gid]) }) })],
 	// XXX Q: should this be a linked task???
 	// 		...on one hand yes, on the other, saving after this may 
 	// 		unintentionally save other state from the main object...

Viewer/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ImageGrid.Viewer.g4",
   "main": "index.html",
-  "version": "4.0.10a",
+  "version": "4.0.11a",
   "author": "Alex A. Naanou <alex.nanou@gmail.com> (https://github.com/flynx)",
   "contributors": [],
   "repository": "github:flynx/ImageGrid",