on master help sign in
[enh] template render updates
b752aceasciimoo
searx/webapp.py+8−4
@@ -25,7 +25,7 @@ if __name__ == "__main__":
25from flask import Flask, request, flash, render_template
25from flask import Flask, request, flash, render_template
26import ConfigParser
26import ConfigParser
27from os import getenv
27from os import getenv
28−from searx.engines import search
28+from searx.engines import search, engines
29
29
30cfg = ConfigParser.SafeConfigParser()
30cfg = ConfigParser.SafeConfigParser()
31cfg.read('/etc/searx.conf')
31cfg.read('/etc/searx.conf')
@@ -37,16 +37,20 @@ cfg.read('searx.conf')
37app = Flask(__name__)
37app = Flask(__name__)
38app.secret_key = cfg.get('app', 'secret_key')
38app.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'])
41def index():
45def 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)
52+ return render('results.html', results=results, q=query)
49− return render_template('index.html')
53+ return render('index.html')
50
54
51if __name__ == "__main__":
55if __name__ == "__main__":
52 from gevent import monkey
56 from gevent import monkey