From 627f971e22188c12367c67e3d24f17ec6cb5b143 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Mon, 2 Oct 2017 02:49:53 +0300
Subject: [PATCH] refactoring, notes and cleanup...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui (gen4)/features/collections.js | 56 +++++++++++++++----------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/ui (gen4)/features/collections.js b/ui (gen4)/features/collections.js
index 2fb7d1f1..c11ed83c 100755
--- a/ui (gen4)/features/collections.js	
+++ b/ui (gen4)/features/collections.js	
@@ -1155,43 +1155,46 @@ module.Collection = core.ImageGridFeatures.Feature({
 				}
 			}],
 
+		// XXX save metadata only if changed... (???)
 		['prepareIndexForWrite', 
 			function(res){
 				if(!res.changes){
 					return
 				}
 				var that = this
-				var changed = res.changes === true
-					|| res.changes.collections
+				var changes = res.changes
 				var collections = this.collections
 
-				// collections partially changed...
-				var partial = Object.keys(collections || {})
-					.filter(function(t){ 
-						return res.changes['collection: '
-							+ JSON.stringify(collections[t].gid)] })
+				// collections fully/partially changed...
+				var full = changes === true ? true 
+					: Object.keys(collections || {})
+						.filter(function(t){ 
+							return res.changes['collection: '
+								+ JSON.stringify(collections[t].gid)] === true })
+				var partial = changes === true ? [] 
+					: Object.keys(collections || {})
+						.filter(function(t){ 
+							return full.indexOf(t) < 0
+								&& res.changes['collection: '
+									+ JSON.stringify(collections[t].gid)] })
 
-				if((partial.length > 0 || changed) 
+				if((full.length > 0 || partial.length > 0)
 						&& res.raw.collections){
 					// select the actual changed collection list...
-					changed = changed === true ? 
+					changed = changes === true ? 
 						Object.keys(res.raw.collections)
-						: changed
-					changed = (changed || []).concat(partial)
+						: (full).concat(partial)
 
 					// collection index...
-					//
 					// NOTE: we are placing this in the index root to 
 					// 		simplify lazy-loading of the collection 
 					// 		index...
-					// XXX save this only if index has changed...
-					// 		...need 'collection-index' in changes...
-					// XXX need lazy-load handler in fs-loader for this...
-					// XXX don't like the name...
-					var index = res.index['collection-index'] = {}
-					Object.keys(res.raw.collections)
-						.forEach(function(title){ 
-							index[collections[title].gid || title] = title  })
+					if(changes && changes.collections){
+						var index = res.index['collection-index'] = {}
+						Object.keys(res.raw.collections)
+							.forEach(function(title){ 
+								index[collections[title].gid || title] = title  })
+					}
 
 					var change_tags = this.config['collection-transfer-changes'] || ['data']
 
@@ -1202,29 +1205,24 @@ module.Collection = core.ImageGridFeatures.Feature({
 								&& changed.indexOf(k) >= 0 })
 						.forEach(function(k){
 							var gid = res.raw.collections[k].gid || k
+							var id = 'collection: '+ JSON.stringify(gid)
 							var path = 'collections/'+ gid
 							var raw = res.raw.collections[k]
 
 							// local collection changes...
-							// XXX local changes are not processed correctly 
-							// 		when the target collection is loaded...
-							// XXX revise the local changes format...
 							var local_changes = partial.indexOf(k) < 0 || {}
-							if(local_changes !== true){
-								(res.changes['collection: '+ JSON.stringify(gid)] || [])
+							if(local_changes !== true && res.changes[id] !== true){
+								(res.changes[id] || [])
 									.forEach(function(c){ local_changes[c] = true })
 							}
 
 							// collections/<gid>/metadata
+							// XXX save this only if changed... (???)
 							var metadata = res.index[path +'/metadata'] = {}
 							Object.keys(raw)
 								.forEach(function(key){ metadata[key] = raw[key] })
 
 							raw.date = res.date
-							// XXX use collection changes!!!
-							// 		...this will need .prepareIndexForWrite(..) 
-							// 		refactoring to replace 'full' with 'changed'...
-							//var prepared = that.prepareIndexForWrite(raw, true).index
 							var prepared = that.prepareIndexForWrite(raw, local_changes).index
 
 							// move the collection data to collection path...