Mostly working search dialog

notes.md

@@ -1,11 +1,5 @@
 Things I still need to do:
 
-* Add numbers to the result list and allow pressing the number to open result.
-* Add descriptions and possibly the url or domain part of the url to each item
-  in the list.
-  - I might need to use something other than the blessed list to accomplish
-    this...
-* Find more universal default color scheme.
 * Make it installable.
   - It might be easier to replace the python part with node then distribute as
     something you can `npm install -g`
@@ -25,3 +19,9 @@ DONE
   - Is a modal the best option for the search form?
 * Search result caching.
 * Return to search form from results list.
+* Add numbers to the result list and allow pressing the number to open result.
+* Add descriptions and possibly the url or domain part of the url to each item
+  in the list.
+  - I might need to use something other than the blessed list to accomplish
+    this...
+* Find more universal default color scheme.

search-pane2

@@ -31,11 +31,9 @@ var form = blessed.form({
     border: {
         type: 'line',
         fg: 'white',
-        bg: 'grey'
     },
     width: '95%',
     height: 7,
-	bg: 'grey',
 	content: 'Search: '
 });
 
@@ -51,16 +49,7 @@ var input = blessed.textbox({
     },
     top: 0,
     left: 10,
-    right: 2,
-	style: {
-		bg: 'darkblue',
-		focus: {
-			bg: 'darkblue'
-		},
-		hover: {
-			bg: 'darkblue'
-		}
-	}
+    right: 2
 });
 
 var submit = blessed.button({
@@ -127,57 +116,34 @@ var loading = blessed.loading({
     },
     border: {
         type: 'line',
-        fg: 'white',
-        bg: 'grey'
+        fg: 'white'
     },
     width: 32,
     height: 7,
-    bg: 'grey',
 });
 
-var results = blessed.listtable({
+var resultsForm = blessed.form({
     parent: screen,
     hidden: true,
-    top: 'center',
-    left: 'center',
-    padding: {
-        left: 1,
-        right: 1,
-        top: 1,
-        bottom: 1
-    },
-    border: {
-        type: 'line',
-        fg: 'white',
-        bg: 'grey'
-    },
-    bg: 'grey',
-    height: 'shrink',
-    width: '95%'
+    input: false,
+    keys: true,
+    tags: true
 });
 
-var resultsList = blessed.list({
-    parent: screen,
-    hidden: true,
+var resultsSet = blessed.radioset({
+    parent: resultsForm,
+    input: false,
     keys: true,
-    top: 'center',
-    left: 'center',
-    padding: {
-        left: 1,
-        right: 1,
-        top: 1,
-        bottom: 1
-    },
+    tags: true,
+    top: 0,
+    left: 0,
     border: {
         type: 'line',
-        fg: 'white',
-        bg: 'grey'
+        fg: 'white'
     },
     selectedBg: 'darkred',
     selectedFg: 'yellow',
-    bg: 'grey',
     scollbar: true,
-    width: '95%'
 });
 
 submit.on('press', function() {
@@ -195,21 +161,49 @@ input.on('submit', function(data) {
 form.on('submit', function(data) {
     form.hide();
     PythonShell.run('results.py', {args: [data.input], mode: 'json',
-                                   scriptPath: '/home/thallada/workspace/search-pane/'},
+                                   scriptPath: '/home/thallada/workspace/search-pane/',
+                                   pythonPath: '/usr/bin/python3'},
                     function (err, results) {
         loading.stop();
         if (err) throw err;
         searchResults = results[0];
-        var list = results[0].map(function(r) {
-            return r.title;
-        });
-        resultsList.setItems(list);
-        resultsList.show();
-        resultsList.focus();
+        resultsForm.show();
+        searchResults.forEach(function(r, i) {
+            var result = blessed.radiobutton({
+                tags: true,
+                top: i * 4,
+                height: 4,
+                padding: {
+                    bottom: 1
+                },
+                text: '{bold}' + (i + 1) + '. ' + r.title + '{/}\n\t{blue-fg}' + r.link + '{/}\n\t' + r.desc
+            });
+            result.set('index', i);
+            resultsSet.append(result);
+            result.key('left', backToSearch);
+            result.on('check', function() { 
+                resultsForm.hide();
+                screen.leave();
+                var browser = screen.spawn('w3m', [searchResults[this.get('index')].link]);
+                var self = this;
+                browser.on('exit', function() {
+                    screen.program.hideCursor();
+                    resultsForm.show();
+                    self.focus();
+                    screen.render();
+                });
+            })
+            result.key('j', listNext);
+            result.key('k', listPrev);
+            result.key('up', listNext);
+            result.key('down', listPrev);
+            result.on('keypress', numberPress);
+        })
+        resultsSet.children[0].focus(); // first result
         screen.render();
     });
     loading.load('Searching...');
-    loading._.icon.style = {bg: 'grey'}; // Hacky, loading icon doesn't support styling via options
+    // loading._.icon.style = {bg: 'grey'}; // Hacky, loading icon doesn't support styling via options
 });
 
 form.on('reset', function(data) {
@@ -217,40 +211,55 @@ form.on('reset', function(data) {
     cleanExit();
 });
 
-resultsList.on('select', function(data) {
-    var i = resultsList.getItemIndex(data);
-    resultsList.hide();
-    screen.leave();
-    var browser = screen.spawn('w3m', [searchResults[i].link]);
-    browser.on('exit', function() {
-        screen.program.hideCursor();
-        resultsList.show();
-        resultsList.focus();
-        screen.render();
-    });
-});
-
-resultsList.key('left', function() {
-    resultsList.hide();
+var backToSearch = function() {
+    screen.saveFocus();
+    resultsForm.hide();
     form.show();
     input.focus();
-});
+    screen.render();
+}
 
-cancel.key('right', function() {
-    form.hide();
-    resultsList.show();
-    resultsList.focus();
-});
+var forwardToList = function() {
+    if (searchResults) {
+        form.hide();
+        resultsForm.show();
+        screen.restoreFocus();
+        screen.render();
+    }
+}
 
-submit.key('right', function() {
-    form.hide();
-    resultsList.show();
-    resultsList.focus();
-});
+var numberPress = function(key) {
+    numbers = ['1', '2', '3', '4', '5', '6', '7', '8', '9']
+    if (numbers.indexOf(key) > -1) {
+        resultsSet.children[parseInt(key, 10) - 1].focus();
+        resultsSet.children[parseInt(key, 10) - 1].check();
+    }
+}
+
+var listNext = function() {
+    resultsForm.focusNext();
+}
+var listPrev = function() {
+    resultsForm.focusPrevious();
+}
+
+// resultsSet.key('left', backToSearch);
+// resultsForm.key('left', backToSearch);
+// resultsSet.on('keypress', numberPress);
+// resultsForm.on('keypress', numberPress);
+
+form.key('right', forwardToList);
+input.key('right', forwardToList);
+submit.key('right', forwardToList);
+cancel.key('right', forwardToList);
 
 screen.key('q', function() {
     cleanExit();
 });
 
+screen.key('escape', function() {
+    cleanExit();
+});
+
 screen.render();
 input.focus();