Bläddra i källkod

[enh] template render updates

asciimoo 11 år sedan
förälder
incheckning
b752ace653
1 ändrade filer med 8 tillägg och 4 borttagningar
  1. 8
    4
      searx/webapp.py

+ 8
- 4
searx/webapp.py Visa fil

@@ -25,7 +25,7 @@ if __name__ == "__main__":
25 25
 from flask import Flask, request, flash, render_template
26 26
 import ConfigParser
27 27
 from os import getenv
28
-from searx.engines import search
28
+from searx.engines import search, engines
29 29
 
30 30
 cfg = ConfigParser.SafeConfigParser()
31 31
 cfg.read('/etc/searx.conf')
@@ -37,16 +37,20 @@ cfg.read('searx.conf')
37 37
 app = Flask(__name__)
38 38
 app.secret_key = cfg.get('app', 'secret_key')
39 39
 
40
+def render(template_name, **kwargs):
41
+    kwargs['engines'] = engines.keys()
42
+    return render_template(template_name, **kwargs)
43
+
40 44
 @app.route('/', methods=['GET', 'POST'])
41 45
 def index():
42 46
     if request.method=='POST':
43 47
         if not request.form.get('q'):
44 48
             flash('Wrong post data')
45
-            return render_template('index.html')
49
+            return render('index.html')
46 50
         query = request.form['q']
47 51
         results = search(query, request)
48
-        return render_template('results.html', results=results, q=query)
49
-    return render_template('index.html')
52
+        return render('results.html', results=results, q=query)
53
+    return render('index.html')
50 54
 
51 55
 if __name__ == "__main__":
52 56
     from gevent import monkey