Pārlūkot izejas kodu

[enh] default settings option to autocomplete backend - #396

Adam Tauber 9 gadus atpakaļ
vecāks
revīzija
c1d9cfd9ae
3 mainītis faili ar 10 papildinājumiem un 2 dzēšanām
  1. 4
    0
      searx/settings.yml
  2. 4
    0
      searx/settings_robot.yml
  3. 2
    2
      searx/webapp.py

+ 4
- 0
searx/settings.yml Parādīt failu

1
 general:
1
 general:
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
+
4
 server:
8
 server:
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

+ 4
- 0
searx/settings_robot.yml Parādīt failu

1
 general:
1
 general:
2
     debug : False
2
     debug : False
3
 
3
 
4
+search:
5
+    safe_search : 0
6
+    autocomplete : 0
7
+
4
 server:
8
 server:
5
     port : 11111
9
     port : 11111
6
     bind_address : 127.0.0.1
10
     bind_address : 127.0.0.1

+ 2
- 2
searx/webapp.py Parādīt failu

263
 def render(template_name, override_theme=None, **kwargs):
263
 def 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
         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)