gevent/gunicorn and some cosmetics

jacobandreas · Mar 28, 2012 · ef8facb · ef8facb
1 parent acf2f24
commit ef8facb
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 22 deletions.
diff --git a/Procfile b/Procfile
@@ -1 +1 @@
-web: python server.py
+web: gunicorn -w 4 -b 0.0.0.0:$PORT -k gevent app:app
diff --git a/server.py → app.py b/server.py → app.py
@@ -4,7 +4,6 @@
 from flask import Flask, Response, send_from_directory, request
 
 app = Flask(__name__)
-app.debug = True
 
 cpl = Completer()
 
@@ -32,6 +31,9 @@ def complete():
   return Response(json.dumps(completions),
                   mimetype='application/json')
 
+@app.route('/debug')
+def debug():
+  return str(app.debug)
+
 if __name__ == '__main__':
-  port = int(os.environ.get('PORT', 5000))
-  app.run(host='0.0.0.0', port=port)
+  app.run(debug=True)
diff --git a/completer.py b/completer.py
@@ -91,12 +91,15 @@ def __init__(self):
       'stranger': StrangerCompleter(),
     }
     self.stranger_completer = self.completers['stranger']
+    self.default_completer = self.completers['stranger']
 
   def complete(self, sources, context):
     completions = []
     for source in sources:
       if source in self.completers:
         completions += self.completers[source].complete(context)
+    if len(completions) == 0:
+      completions += self.default_completer.complete(context)
     self.stranger_completer.update(context)
     random.shuffle(completions)
     return completions
diff --git a/requirements.txt b/requirements.txt
@@ -5,6 +5,9 @@ Werkzeug==0.8.3
 certifi==0.0.8
 chardet==1.0.1
 distribute==0.6.24
+gevent==0.13.6
+greenlet==0.3.4
+gunicorn==0.14.2
 nltk==2.0.1rc4
 requests==0.10.8
 wsgiref==0.1.2
diff --git a/static/css/style.css b/static/css/style.css
@@ -40,10 +40,18 @@ body {
 #sources {
   cursor: pointer;
 }
+#sources li .plus {
+  color: transparent;
+}
 
 #sources li.selected {
   font-weight: bold;
   color: #ccc;
+  text-shadow: 0 0 3px rgba(200,200,200,0.5);
+}
+
+#sources li.selected .plus {
+  color: #ccc;
 }
 
 input[type=checkbox] {

diff --git a/static/index.html b/static/index.html
@@ -15,9 +15,9 @@
   </head>
   <body>
     <ul id='sources'>
-      <li id='google'>Google
-      <li id='austen'>Austen
-      <li id='stranger'>Strangers
+      <li id='google'><span class='plus'>+</span> Google
+      <li id='austen'><span class='plus'>+</span> Austen
+      <li id='stranger'><span class='plus'>+</span> Strangers
     </ul>
     <div id='spinner'></div>
     <div id='text' contenteditable='true'></div>  

diff --git a/static/js/autocomplete.js b/static/js/autocomplete.js
@@ -1,6 +1,7 @@
 /* globals */
 var selected_sources = []
 var currentReq;
+var currentTimeout;
 var completions;
 var completionIndex;
 
@@ -67,29 +68,36 @@ function setupEvents() {
       currentReq.abort();
       currentReq = null;
       completions = null;
+      $('#spinner').hide();
+    }
+    if (currentTimeout) {
+      clearTimeout(currentTimeout);
+      currentTimeout = null;
     }
     if (evt.which === 32) {
       if (evt.ctrlKey && completions) {
         showNextCompletion();
         return;
       }
-      var ct = getCurrentTrigram();
-      if (ct === '') {
-        return;
-      }
-      $('#spinner').show()
-      currentReq = $.get('/complete',
-            {'sources': getSourcesList(), 'context': ct},
-            function(data) {
-        currentReq = null;
-        $('#spinner').hide()
-        if (data.length === 0) {
+      setTimeout(function() {
+        var ct = getCurrentTrigram();
+        if (ct === '') {
           return;
         }
-        completions = data;
-        completionIndex = 0;
-        showNextCompletion();
-      });
+        $('#spinner').show()
+        currentReq = $.get('/complete',
+              {'sources': getSourcesList(), 'context': ct},
+              function(data) {
+          currentReq = null;
+          $('#spinner').hide()
+          if (data.length === 0) {
+            return;
+          }
+          completions = data;
+          completionIndex = 0;
+          showNextCompletion();
+        });
+      }, 500);
     }
   });
   $('#sources li').each(function() {