commit: f76d80de543996f9a90eaf46e226354ad4681731
parent: 1aff439931e134a7f01bf1fdfb9f4af3e81a990c
Author: asciimoo <asciimoo@gmail.com>
Date: Thu, 17 Oct 2013 21:06:28 +0200
[enh] category support
Diffstat:
3 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/searx/engines/__init__.py b/searx/engines/__init__.py
@@ -27,15 +27,23 @@ engine_dir = dirname(realpath(__file__))
engines = {}
+categories = {'general': []}
+
for filename in listdir(engine_dir):
modname = splitext(filename)[0]
if filename.startswith('_') or not filename.endswith('.py'):
continue
filepath = join(engine_dir, filename)
engine = load_source(modname, filepath)
+ engine.name = modname
if not hasattr(engine, 'request') or not hasattr(engine, 'response'):
continue
engines[modname] = engine
+ if not hasattr(engine, 'categories'):
+ categories['general'].append(engine)
+ else:
+ for category_name in engine.categories:
+ categories.setdefault(category_name, []).append(engine)
def default_request_params():
return {'method': 'GET', 'headers': {}, 'data': {}, 'url': ''}
diff --git a/searx/templates/search.html b/searx/templates/search.html
@@ -2,8 +2,8 @@
<input type="text" class="q" name="q" tabindex="1" autocomplete="off" {% if q %}value="{{ q }}"{% endif %}/>
<input type="submit" value="search" />
<p>
- {% for engine in engines %}
- {{ engine }}: <input type="checkbox" name="engine_{{ engine }}" checked="checked"/>
+ {% for category in categories %}
+ {{ category }}: <input type="checkbox" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} />
{% endfor %}
</p>
</form>
diff --git a/searx/webapp.py b/searx/webapp.py
@@ -25,7 +25,7 @@ if __name__ == "__main__":
from flask import Flask, request, flash, render_template, url_for, Response
import ConfigParser
from os import getenv
-from searx.engines import search, engines
+from searx.engines import search, categories
import json
cfg = ConfigParser.SafeConfigParser()
@@ -51,27 +51,36 @@ opensearch_xml = '''<?xml version="1.0" encoding="utf-8"?>
'''
def render(template_name, **kwargs):
- kwargs['engines'] = engines.keys()
+ global categories
+ kwargs['categories'] = categories.keys()
+ if not 'selected_categories' in kwargs:
+ kwargs['selected_categories'] = ['general']
return render_template(template_name, **kwargs)
@app.route('/', methods=['GET', 'POST'])
def index():
+ global categories
if request.method=='POST':
if not request.form.get('q'):
flash('Wrong post data')
return render('index.html')
selected_engines = []
+ selected_categories = []
for pd_name,pd in request.form.items():
- if pd_name.startswith('engine_'):
- selected_engines.append(pd_name[7:])
+ if pd_name.startswith('category_'):
+ category = pd_name[9:]
+ if not category in categories:
+ continue
+ selected_categories.append(category)
+ selected_engines.extend(x.name for x in categories[category])
if not len(selected_engines):
- selected_engines = engines.keys()
+ selected_engines = [x.name for x in categories['general']]
query = request.form['q'].encode('utf-8')
results = search(query, request, selected_engines)
if request.form.get('format') == 'json':
# TODO HTTP headers
return json.dumps({'query': query, 'results': results})
- return render('results.html', results=results, q=query.decode('utf-8'))
+ return render('results.html', results=results, q=query.decode('utf-8'), selected_categories=selected_categories)
return render('index.html')
@app.route('/favicon.ico', methods=['GET'])