From dcb734308ef09412636e0c21c11af9701f035fcb Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Sat, 28 Dec 2013 08:57:11 +0400
Subject: [PATCH] now makeFileLoader(..) has default value and error andler
 arguments...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui/bookmarks.js |  5 +++--
 ui/files.js     |  9 ++++++---
 ui/marks.js     |  1 +
 ui/tags.js      | 12 +++++++++++-
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ui/bookmarks.js b/ui/bookmarks.js
index f8a49259..84719208 100755
--- a/ui/bookmarks.js
+++ b/ui/bookmarks.js
@@ -111,9 +111,10 @@ var loadFileBookmarks = makeFileLoader(
 		'Bookmarks', 
 		BOOKMARKS_FILE_DEFAULT, 
 		BOOKMARKS_FILE_PATTERN, 
+		[[], {}],
 		function(data){ 
-			BOOKMARKS = data[0] == null ? [] : data[0]
-			BOOKMARKS_DATA = data[1] == null ? {} : data[1]
+			BOOKMARKS = data[0]
+			BOOKMARKS_DATA = data[1]
 		})
 
 
diff --git a/ui/files.js b/ui/files.js
index bef666db..54bd0678 100755
--- a/ui/files.js
+++ b/ui/files.js
@@ -205,7 +205,7 @@ function loadLatestFile(path, dfl, pattern, diff_pattern, default_data){
 }
 
 
-function makeFileLoader(title, file_dfl, file_pattern, set_data, evt_name, skip_reg){
+function makeFileLoader(title, file_dfl, file_pattern, default_data, set_data, error, evt_name, skip_reg){
 	var _loader = function(path){
 		var res = $.Deferred()
 		// default locations...
@@ -215,7 +215,7 @@ function makeFileLoader(title, file_dfl, file_pattern, set_data, evt_name, skip_
 					file_dfl, 
 					file_pattern,
 					null,
-					[])
+					default_data)
 		
 		// explicit path...
 		// XXX need to account for paths without a CONFIG.cache_dir
@@ -230,13 +230,16 @@ function makeFileLoader(title, file_dfl, file_pattern, set_data, evt_name, skip_
 					path.split(base)[0], 
 					RegExp(path.split(base)[0]),
 					null,
-					[])
+					default_data)
 		}
 
 		bubbleProgress(title, loader, res)
 
 		res.done(set_data)
 
+		if(error != null){
+			res.fail(error)
+		}
 		if(evt_name != null){
 			res.done(function(){ $('.viewer').trigger(evt_name) })
 		}
diff --git a/ui/marks.js b/ui/marks.js
index 54cab849..9793ab48 100755
--- a/ui/marks.js
+++ b/ui/marks.js
@@ -566,6 +566,7 @@ var loadFileMarks = makeFileLoader(
 		'Marks', 
 		MARKED_FILE_DEFAULT, 
 		MARKED_FILE_PATTERN, 
+		[],
 		function(data){ 
 			// set the MARKED...
 			MARKED = data
diff --git a/ui/tags.js b/ui/tags.js
index 0c863e74..41458092 100755
--- a/ui/tags.js
+++ b/ui/tags.js
@@ -469,8 +469,18 @@ var loadFileTags = makeFileLoader(
 		'Tags', 
 		TAGS_FILE_DEFAULT, 
 		TAGS_FILE_PATTERN, 
+		false,
 		function(data){ 
-			TAGS = data.length != null ? {} : data
+			//TAGS = data.length != null ? {} : data
+			if(data === false){
+				var t0 = Date.now()
+				buildTagsFromImages()
+				var t1 = Date.now()
+
+				console.warn('Tags: build tags.json: done ('+( t1 - t0 )+'ms) -- re-save the data.')
+			} else {
+				TAGS = data
+			}
 		})