Explorar el Código

[enh] template render updates

asciimoo hace 11 años
padre
commit
b752ace653
Se han modificado 1 ficheros con 8 adiciones y 4 borrados
  1. 8
    4
      searx/webapp.py

+ 8
- 4
searx/webapp.py Ver fichero

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