diff options
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | searx/engines/__init__.py | 4 | ||||
| -rw-r--r-- | searx/static/css/style.css | 4 | ||||
| -rw-r--r-- | searx/templates/base.html | 2 | ||||
| -rw-r--r-- | searx/templates/results.html | 3 | ||||
| -rw-r--r-- | searx/webapp.py | 7 |
6 files changed, 19 insertions, 2 deletions
@@ -11,6 +11,7 @@ A hackable [metasearch engine](https://en.wikipedia.org/wiki/Metasearch_engine) * Supports json output `curl -d 'format=json' -d 'q=searx' http://searx.0x2a.tk/` * Opensearch support (you can set as default search engine in your browser) * Search categories +* User-agent forwarding ### Installation diff --git a/searx/engines/__init__.py b/searx/engines/__init__.py index af2973138..6bfcdab2b 100644 --- a/searx/engines/__init__.py +++ b/searx/engines/__init__.py @@ -50,7 +50,7 @@ for filename in listdir(engine_dir): categories.setdefault(category_name, []).append(engine) def default_request_params(): - return {'method': 'GET', 'headers': {}, 'data': {}, 'url': ''} + return {'method': 'GET', 'headers': {}, 'data': {}, 'url': '', 'cookies': {}} def make_callback(engine_name, results, callback): def process_callback(response, **kwargs): @@ -77,12 +77,14 @@ def search(query, request, selected_engines): req = grequests.get(request_params['url'] ,headers=headers ,hooks=dict(response=callback) + ,cookies = request_params['cookies'] ) else: req = grequests.post(request_params['url'] ,data=request_params['data'] ,headers=headers ,hooks=dict(response=callback) + ,cookies = request_params['cookies'] ) requests.append(req) grequests.map(requests) diff --git a/searx/static/css/style.css b/searx/static/css/style.css index 79e7ca2cb..0ae826002 100644 --- a/searx/static/css/style.css +++ b/searx/static/css/style.css @@ -12,6 +12,8 @@ input { border: 2px solid #666666; color: #444444; padding: 8px; background-col a { text-decoration: none; } +#container { position: relative;} + .result_title { margin-bottom: 0; } .result p { margin-top: 0; padding-top: 0; font-size: 0.8em; max-width: 50em; } @@ -25,3 +27,5 @@ a { text-decoration: none; } .engines { color: #888888; } .small p { margin: 2px 0; } + +.right { float: right; } diff --git a/searx/templates/base.html b/searx/templates/base.html index 4031aec9d..27b7dd26d 100644 --- a/searx/templates/base.html +++ b/searx/templates/base.html @@ -12,7 +12,9 @@ {% endblock %} </head> <body> +<div id="container"> {% block content %} {% endblock %} +</div> </body> </html> diff --git a/searx/templates/results.html b/searx/templates/results.html index 287f71477..a6191259b 100644 --- a/searx/templates/results.html +++ b/searx/templates/results.html @@ -1,5 +1,8 @@ {% extends "base.html" %} {% block content %} +<div class="right"> + <a href="/" title="searx" class="site_link">searx</a> | Number of results: {{ number_of_results }} +</div> <div class="small"> {% include 'search.html' %} </div> diff --git a/searx/webapp.py b/searx/webapp.py index 6bfe4c40a..c1b13c419 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -84,7 +84,12 @@ def index(): if request.form.get('format') == 'json': # TODO HTTP headers return json.dumps({'query': query, 'results': results}) - template = render('results.html', results=results, q=query.decode('utf-8'), selected_categories=selected_categories) + template = render('results.html' + ,results=results + ,q=query.decode('utf-8') + ,selected_categories=selected_categories + ,number_of_results=len(results) + ) resp = make_response(template) if remember_categs: resp.set_cookie('categories', ','.join(selected_categories)) |