git.iko.soy/searx
on master help sign in
[enh] category support
commitf76d80de543996f9a90eaf46e226354ad4681731 authorasciimoo <asciimoo@gmail.com> dateThu 17 Oct 2013, 21:06 (13 years ago) parent1aff439
3 files changed+25−8
compare with master
unifiedsplit
searx/engines/__init__.py+8 searx/templates/search.html+2−2 searx/webapp.py+15−6
searx/engines/__init__.py+8
@@ -27,15 +27,23 @@ engine_dir = dirname(realpath(__file__))
2727
2828engines = {}
2929
30+categories = {'general': []}
31+
3032for filename in listdir(engine_dir):
3133 modname = splitext(filename)[0]
3234 if filename.startswith('_') or not filename.endswith('.py'):
3335 continue
3436 filepath = join(engine_dir, filename)
3537 engine = load_source(modname, filepath)
38+ engine.name = modname
3639 if not hasattr(engine, 'request') or not hasattr(engine, 'response'):
3740 continue
3841 engines[modname] = engine
42+ if not hasattr(engine, 'categories'):
43+ categories['general'].append(engine)
44+ else:
45+ for category_name in engine.categories:
46+ categories.setdefault(category_name, []).append(engine)
3947
4048def default_request_params():
4149 return {'method': 'GET', 'headers': {}, 'data': {}, 'url': ''}
searx/templates/search.html+2−2
@@ -2,8 +2,8 @@
22 <input type="text" class="q" name="q" tabindex="1" autocomplete="off" {% if q %}value="{{ q }}"{% endif %}/>
33 <input type="submit" value="search" />
44 <p>
5− {% for engine in engines %}
6− {{ engine }}: <input type="checkbox" name="engine_{{ engine }}" checked="checked"/>
5+ {% for category in categories %}
6+ {{ category }}: <input type="checkbox" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} />
77 {% endfor %}
88 </p>
99</form>
searx/webapp.py+15−6
@@ -25,7 +25,7 @@ if __name__ == "__main__":
2525from flask import Flask, request, flash, render_template, url_for, Response
2626import ConfigParser
2727from os import getenv
28−from searx.engines import search, engines
28+from searx.engines import search, categories
2929import json
3030
3131cfg = ConfigParser.SafeConfigParser()
@@ -51,27 +51,36 @@ opensearch_xml = '''<?xml version="1.0" encoding="utf-8"?>
5151'''
5252
5353def render(template_name, **kwargs):
54− kwargs['engines'] = engines.keys()
54+ global categories
55+ kwargs['categories'] = categories.keys()
56+ if not 'selected_categories' in kwargs:
57+ kwargs['selected_categories'] = ['general']
5558 return render_template(template_name, **kwargs)
5659
5760@app.route('/', methods=['GET', 'POST'])
5861def index():
62+ global categories
5963 if request.method=='POST':
6064 if not request.form.get('q'):
6165 flash('Wrong post data')
6266 return render('index.html')
6367 selected_engines = []
68+ selected_categories = []
6469 for pd_name,pd in request.form.items():
65− if pd_name.startswith('engine_'):
66− selected_engines.append(pd_name[7:])
70+ if pd_name.startswith('category_'):
71+ category = pd_name[9:]
72+ if not category in categories:
73+ continue
74+ selected_categories.append(category)
75+ selected_engines.extend(x.name for x in categories[category])
6776 if not len(selected_engines):
68− selected_engines = engines.keys()
77+ selected_engines = [x.name for x in categories['general']]
6978 query = request.form['q'].encode('utf-8')
7079 results = search(query, request, selected_engines)
7180 if request.form.get('format') == 'json':
7281 # TODO HTTP headers
7382 return json.dumps({'query': query, 'results': results})
74− return render('results.html', results=results, q=query.decode('utf-8'))
83+ return render('results.html', results=results, q=query.decode('utf-8'), selected_categories=selected_categories)
7584 return render('index.html')
7685
7786@app.route('/favicon.ico', methods=['GET'])