on master help sign in
[enh] default settings option to autocomplete backend - #396
c1d9cfdAdam Tauber
searx/settings.yml+4
@@ -1,6 +1,10 @@
1general:
1general:
2 debug : False # Debug mode, only for development
2 debug : False # Debug mode, only for development
3
3
4+search:
5+ safe_search : 0 # Filter results. 0: None, 1: Moderate, 2: Strict
6+ autocomplete : "" # Existing autocomplete backends: "dbpedia", "duckduckgo", "google", "startpage", "wikipedia" - leave blank to turn it off by default
7+
4server:
8server:
5 port : 8888
9 port : 8888
6 bind_address : "127.0.0.1" # address to listen on
10 bind_address : "127.0.0.1" # address to listen on
searx/settings_robot.yml+4
@@ -1,6 +1,10 @@
1general:
1general:
2 debug : False
2 debug : False
3
3
4+search:
5+ safe_search : 0
6+ autocomplete : 0
7+
4server:
8server:
5 port : 11111
9 port : 11111
6 bind_address : 127.0.0.1
10 bind_address : 127.0.0.1
searx/webapp.py+2−2
@@ -263,7 +263,7 @@ def image_proxify(url):
263def render(template_name, override_theme=None, **kwargs):
263def render(template_name, override_theme=None, **kwargs):
264 blocked_engines = get_blocked_engines(engines, request.cookies)
264 blocked_engines = get_blocked_engines(engines, request.cookies)
265
265
266− autocomplete = request.cookies.get('autocomplete')
266+ autocomplete = request.cookies.get('autocomplete', settings['search']['autocomplete'])
267
267
268 if autocomplete not in autocomplete_backends:
268 if autocomplete not in autocomplete_backends:
269 autocomplete = None
269 autocomplete = None
@@ -491,7 +491,7 @@ def autocompleter():
491 return '', 400
491 return '', 400
492
492
493 # run autocompleter
493 # run autocompleter
494− completer = autocomplete_backends.get(request.cookies.get('autocomplete'))
494+ completer = autocomplete_backends.get(request.cookies.get('autocomplete', settings['search']['autocomplete']))
495
495
496 # parse searx specific autocompleter results like !bang
496 # parse searx specific autocompleter results like !bang
497 raw_results = searx_bang(query)
497 raw_results = searx_bang(query)