git.iko.soy/searx
on master help sign in
preferences.py: implement defaults if unset
1cae4faMarkus Heiser
searx/preferences.py+25−17
compare with master
unifiedsplit
@@ -326,43 +326,51 @@ class Preferences(object):
326 ['general'], choices=categories + ['none']
326 ['general'], choices=categories + ['none']
327 ),
327 ),
328 'language': SearchLanguageSetting(
328 'language': SearchLanguageSetting(
329− settings['search']['default_lang'],
329+ settings['search'].get('default_lang', ''),
330 choices=list(LANGUAGE_CODES) + ['']
330 choices=list(LANGUAGE_CODES) + ['']
331 ),
331 ),
332 'locale': EnumStringSetting(
332 'locale': EnumStringSetting(
333− settings['ui']['default_locale'],
333+ settings['ui'].get('default_locale', ''),
334 choices=list(settings['locales'].keys()) + ['']
334 choices=list(settings['locales'].keys()) + ['']
335 ),
335 ),
336 'autocomplete': EnumStringSetting(
336 'autocomplete': EnumStringSetting(
337− settings['search']['autocomplete'],
337+ settings['search'].get('autocomplete', ''),
338 choices=list(autocomplete.backends.keys()) + ['']
338 choices=list(autocomplete.backends.keys()) + ['']
339 ),
339 ),
340 'image_proxy': MapSetting(
340 'image_proxy': MapSetting(
341− settings['server']['image_proxy'],
341+ settings['server'].get('image_proxy', False),
342+ map={
342− map={ '': settings['server']['image_proxy'],
343+ '': settings['server'].get('image_proxy', 0),
343− '0': False,
344+ '0': False,
344− '1': True,
345+ '1': True,
345− 'True': True,
346+ 'True': True,
346− 'False': False}
347+ 'False': False
348+ }
347 ),
349 ),
348 'method': EnumStringSetting(
350 'method': EnumStringSetting(
349 'POST',
351 'POST',
350 choices=('GET', 'POST')
352 choices=('GET', 'POST')
351 ),
353 ),
352 'safesearch': MapSetting(
354 'safesearch': MapSetting(
353− settings['search']['safe_search'],
355+ settings['search'].get('safe_search', 0),
354− map={'0': 0,
356+ map={
357+ '0': 0,
355− '1': 1,
358+ '1': 1,
356− '2': 2}),
359+ '2': 2
360+ }
361+ ),
357 'theme': EnumStringSetting(
362 'theme': EnumStringSetting(
358− settings['ui']['default_theme'],
363+ settings['ui'].get('default_theme', 'oscar'),
359 choices=themes
364 choices=themes
360 ),
365 ),
361 'results_on_new_tab': MapSetting(
366 'results_on_new_tab': MapSetting(
362 False,
367 False,
368+ map={
363− map ={'0': False, '1': True,
369+ '0': False,
370+ '1': True,
364− 'False': False,
371+ 'False': False,
365− 'True': True}
372+ 'True': True
373+ }
366 ),
374 ),
367 'doi_resolver': MultipleChoiceSetting(
375 'doi_resolver': MultipleChoiceSetting(
368 ['oadoi.org'], choices=DOI_RESOLVERS
376 ['oadoi.org'], choices=DOI_RESOLVERS
searx/settings_robot.yml−4
@@ -3,8 +3,6 @@ general:
3 instance_name : "searx_test"
3 instance_name : "searx_test"
4
4
5search:
5search:
6− safe_search : 0
7− autocomplete : ""
8 language: "all"
6 language: "all"
9
7
10server:
8server:
@@ -12,14 +10,12 @@ server:
12 bind_address : 127.0.0.1
10 bind_address : 127.0.0.1
13 secret_key : "ultrasecretkey" # change this!
11 secret_key : "ultrasecretkey" # change this!
14 base_url : False
12 base_url : False
15− image_proxy : False
16 http_protocol_version : "1.0"
13 http_protocol_version : "1.0"
17
14
18ui:
15ui:
19 static_path : ""
16 static_path : ""
20 templates_path : ""
17 templates_path : ""
21 default_theme : oscar
18 default_theme : oscar
22− default_locale : ""
23
19
24outgoing:
20outgoing:
25 request_timeout : 1.0 # seconds
21 request_timeout : 1.0 # seconds