Better padding, caching, return to form from list

notes.md

@@ -1,9 +1,5 @@
 Things I still need to do:
 
-* Better padding so search can be used in very small terminal windows.
-  - The search input scrolls when text reaches half the width...
-  - Is a modal the best option for the search form?
-* 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.
@@ -14,7 +10,6 @@ Things I still need to do:
   - It might be easier to replace the python part with node then distribute as
     something you can `npm install -g`
 * Read-line input. I should be able to up-arrow to get my last search.
-* Search result caching.
 * Settings file or panel for configuring colors and keys.
 * Question mark should open keyboard shortcut info.
 * Autocomplete? Maybe too much.
@@ -25,3 +20,8 @@ Things I still need to do:
 DONE
 * Figure out why there is no visible cursor in w3m when result is opened.
   - Screen.spawn() should be showing the cursor but it's not. Tmux issue?
+* Better padding so search can be used in very small terminal windows.
+  - The search input scrolls when text reaches half the width...
+  - Is a modal the best option for the search form?
+* Search result caching.
+* Return to search form from results list.

results.py

@@ -1,10 +1,35 @@
 import argparse
 import json
+import os
 
+from beaker.cache import CacheManager
+from beaker.util import parse_cache_config_options
 from ddg import search
 
-parser = argparse.ArgumentParser(description='Search duckduckgo and return JSON results')
+os.makedirs('cache', exist_ok=True)
+os.makedirs('cache/data', exist_ok=True)
+os.makedirs('cache/lock', exist_ok=True)
+
+cache_opts = {
+    'cache.type': 'file',
+    'cache.data_dir': 'cache/data',
+    'cache.lock_dir': 'cache/lock'
+}
+
+cache = CacheManager(**parse_cache_config_options(cache_opts))
+search_result_cache = cache.get_cache('search-results')
+
+parser = argparse.ArgumentParser(
+    description='Search duckduckgo and return JSON results'
+)
 parser.add_argument('query', metavar='Q', type=str,
-                   help='The query to search on duckduckgo')
+                    help='The query to search on duckduckgo')
 args = parser.parse_args()
-print(json.dumps(list(search(args.query, max_results=10))))
+
+
+def get_results():
+    return list(search(args.query, max_results=10))
+
+results = search_result_cache.get(key=args.query, createfunc=get_results)
+
+print(json.dumps(results))

search-pane2

@@ -3,6 +3,7 @@ var blessed = require('blessed'),
     PythonShell = require('python-shell'),
 	screen = blessed.screen({
         smartCSR: true,
+        autoPadding: true
     }),
     searchResults;
 
@@ -32,8 +33,8 @@ var form = blessed.form({
         fg: 'white',
         bg: 'grey'
     },
-	width: 'shrink',
-	height: 5,
+    width: '95%',
+    height: 7,
 	bg: 'grey',
 	content: 'Search: '
 });
@@ -50,6 +51,7 @@ var input = blessed.textbox({
     },
     top: 0,
     left: 10,
+    right: 2,
 	style: {
 		bg: 'darkblue',
 		focus: {
@@ -69,7 +71,7 @@ var submit = blessed.button({
 		left: 1,
 		right: 1
 	},
-	left: 10,
+	right: 12,
 	top: 2,
 	name: 'submit',
 	content: 'submit',
@@ -94,7 +96,7 @@ var cancel = blessed.button({
 		left: 1,
 		right: 1
 	},
-	left: 20,
+	right: 2,
 	top: 2,
 	name: 'cancel',
 	content: 'cancel',
@@ -150,7 +152,8 @@ var results = blessed.listtable({
         bg: 'grey'
     },
     bg: 'grey',
-    height: 'shrink'
+    height: 'shrink',
+    width: '95%'
 });
 
 var resultsList = blessed.list({
@@ -173,7 +176,8 @@ var resultsList = blessed.list({
     selectedBg: 'darkred',
     selectedFg: 'yellow',
     bg: 'grey',
-    scollbar: true
+    scollbar: true,
+    width: '95%'
 });
 
 submit.on('press', function() {
@@ -219,12 +223,31 @@ resultsList.on('select', function(data) {
     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();
+    form.show();
+    input.focus();
+});
+
+cancel.key('right', function() {
+    form.hide();
+    resultsList.show();
+    resultsList.focus();
+});
+
+submit.key('right', function() {
+    form.hide();
+    resultsList.show();
+    resultsList.focus();
+});
+
 screen.key('q', function() {
     cleanExit();
 });