From d1caf1a0d641fb35dd71a0bae8ceabb816da5785 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Wed, 8 Mar 2017 19:34:49 +0300
Subject: [PATCH] now loading self-corrects data...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui (gen4)/features/filesystem.js | 16 ++++++++++++++--
 ui (gen4)/imagegrid/formats.js   | 30 ++++++++++++++++++++++++++++--
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/ui (gen4)/features/filesystem.js b/ui (gen4)/features/filesystem.js
index 69db0240..bb869532 100755
--- a/ui (gen4)/features/filesystem.js	
+++ b/ui (gen4)/features/filesystem.js	
@@ -324,11 +324,23 @@ var FileSystemLoaderActions = actions.Actions({
 						var k = paths[i]
 
 						// skip empty indexes...
-						// XXX should we rebuild  or list here???
-						if(res[k].data == null || res[k].images == null){
+						// XXX should we rebuild or list here???
+						if(res[k].data == null && res[k].images == null){
 							continue
 						}
 
+						// build the data from images...
+						// XXX
+						if(res[k].data == null){
+							var g = data.Data().newGid()
+							res[k].data = {
+								order: Object.keys(res[k].images),
+								//ribbons: {},
+								//ribbon_order: [g],
+							}
+							//res[k].data.ribbons[g] = res[k].data.order.slice()
+						}
+
 						var part = that.prepareJSONForLoad(res[k], k)
 
 						// load the first index...
diff --git a/ui (gen4)/imagegrid/formats.js b/ui (gen4)/imagegrid/formats.js
index 2e0f50e9..dff373b2 100755
--- a/ui (gen4)/imagegrid/formats.js	
+++ b/ui (gen4)/imagegrid/formats.js	
@@ -13,6 +13,26 @@ module.VERSIONS = []
 
 /*********************************************************************/
 
+var completeData = 
+module.completeData =
+function(data){
+	// XXX is this the right way to go???
+	var that = require('imagegrid/data').Data()
+
+	var ribbons = data.ribbons = data.ribbons || {}
+
+	if(Object.keys(ribbons).length == 0){
+		ribbons[that.newGid()] = data.order.slice()
+	}
+
+	data.ribbon_order = data.ribbon_order || Object.keys(ribbons)
+
+	return data
+}
+
+
+
+/*********************************************************************/
 
 // Convert legacy Gen1 data format to Gen3 format version 2.0+
 //
@@ -21,6 +41,8 @@ module.VERSIONS = []
 //module.convertDataGen1 =
 module.VERSIONS['2.0'] =
 function(data, cmp){
+	//data = data.version < '2.0' ? module.VERSIONS['2.0'](data) : data
+
 	var res = {
 		data: {
 			version: '2.0',
@@ -125,7 +147,11 @@ function(data){
 // Get latest updater version...
 //
 module.getLatestUpdaterVersion = function(){
-	return Object.keys(module.VERSIONS).sort().pop()
+	return Object.keys(module.VERSIONS)
+		.map(function(v){ return [v, parseFloat(v)] })
+		.sort(function(a, b){ return a[1] - b[1]  })
+		.map(function(e){ return e[0] })
+		.pop()
 }
 
 
@@ -144,7 +170,7 @@ module.updateData = function(data, clean){
 	var v = module.getLatestUpdaterVersion()
 	var res = data.version < v
 		? module.VERSIONS[v](data) 
-		: data
+		: completeData(data)
 
 	!clean
 		&& Object.keys(data).forEach(function(k){