From b95aeb0b248207faa47aac905467238d9e28a68d Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Thu, 14 Mar 2019 00:45:33 +0300
Subject: [PATCH] tweaking...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 scripts/process-archive.sh                    |  2 +
 .../media/img/my/work/process-archive.sh      |  2 +
 ui (gen4)/lib/widget/browse2.html             |  5 +-
 ui (gen4)/lib/widget/browse2.js               | 46 +++++++++++++------
 4 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/scripts/process-archive.sh b/scripts/process-archive.sh
index 68be081d..4a8c10af 100755
--- a/scripts/process-archive.sh
+++ b/scripts/process-archive.sh
@@ -287,6 +287,8 @@ fi
 
 # build cache...
 if [ -z $SKIP_CACHE ] ; then
+	# a little tweak to make build cache work...
+	export PYTHONIOENCODING=UTF-8	
 	#if [ -z $TOTAL ] ; then
 	#	export TOTAL=`find . -path '*hi-res (RAW)/*.jpg' | wc -l`
 	#fi
diff --git a/ui (gen4)/archive/media/img/my/work/process-archive.sh b/ui (gen4)/archive/media/img/my/work/process-archive.sh
index 68be081d..4a8c10af 100755
--- a/ui (gen4)/archive/media/img/my/work/process-archive.sh	
+++ b/ui (gen4)/archive/media/img/my/work/process-archive.sh	
@@ -287,6 +287,8 @@ fi
 
 # build cache...
 if [ -z $SKIP_CACHE ] ; then
+	# a little tweak to make build cache work...
+	export PYTHONIOENCODING=UTF-8	
 	#if [ -z $TOTAL ] ; then
 	#	export TOTAL=`find . -path '*hi-res (RAW)/*.jpg' | wc -l`
 	#fi
diff --git a/ui (gen4)/lib/widget/browse2.html b/ui (gen4)/lib/widget/browse2.html
index 09e0e91b..528d61e9 100755
--- a/ui (gen4)/lib/widget/browse2.html	
+++ b/ui (gen4)/lib/widget/browse2.html	
@@ -110,9 +110,9 @@ requirejs([
 			'b')
 		// XXX Q: should we show only one if multiple lines are in sequence???
 		make('---')
-		make('---')
+		//make('---')
 		// XXX not yet visible...
-		make('...')
+		//make('...')
 		make('e')
 		// embeded browser...
 		make(browser.Browser(function(make){
@@ -125,6 +125,7 @@ requirejs([
 			make('moo', {disabled: true}),
 			2,
 		])
+		make('in between...')
 		// nested browser...
 		make.nest('B', 
 			browser.Browser(function(make){
diff --git a/ui (gen4)/lib/widget/browse2.js b/ui (gen4)/lib/widget/browse2.js
index 375573b0..f1e9144d 100755
--- a/ui (gen4)/lib/widget/browse2.js	
+++ b/ui (gen4)/lib/widget/browse2.js	
@@ -340,6 +340,13 @@ var BaseBrowserPrototype = {
 	},
 
 
+	get length(){
+		return this.map({skipNested: true}).length
+			+ this.nested()
+				.reduce(function(res, e){ 
+					return res + e.sublist.length }, 0) },
+
+
 	// Item list constructor...
 	//
 	// 	.__list__(make, options)
@@ -727,7 +734,7 @@ var BaseBrowserPrototype = {
 	//
 	// XXX add path support...
 	// XXX add literal item support (???)
-	get: function(key){
+	get: function(key, _){
 		key = key == null ? 0 : key
 
 		// index...
@@ -738,30 +745,41 @@ var BaseBrowserPrototype = {
 				.map(function(e, i){ 
 					return [e, i] })
 				.compact()
+			var i = 0
+			var offset = 0
 
 			do {
 				// direct match...
-				if(sublists.length == 0 || key < sublists[0][1]){
-					return items[key]
+				if(sublists.length == 0 || key - offset < sublists[0][1]){
+					return items[key - i]
 				}
 
 				// query the sublist...
-				var list = sublists.shift()
-				console.log('>>>>', key - list[1])
-				var res = list[0].value instanceof Browser ?
-						list[0].value.get(key - list[1])
-					// XXX also get header....
-					: list[0].sublist instanceof Browser ?
-						list[0].sublist.get(key - list[1])
-					: list[0].sublist[key - list[1]]
+				var [sublist, i] = sublists.shift()
+
+				// inlined...
+				if(sublist.value instanceof Browser){
+					var res = sublist.value.get(key - i, true)
+
+				// nested...
+				} else { 
+					var res = key - i == 1 ?
+							sublist
+						: sublist.sublist instanceof Browser ?
+							sublist.sublist.get(key - i - offset, true) 
+						: sublist.sublist[key - i - offset]
+					// account for the header...
+					offset += 1
+				}
 
 				if(res !== undefined){
 					return res
 				}
 
-				items = items.slice(list[1] + 1)
-				key = key - list[key] - 1
-			} while(items.length > 0)
+				offset = offset + (sublist.sublist || sublist.value).length
+
+			// XXX not sure about this...
+			} while(items.length > key - (i + offset))
 
 			return undefined