浏览代码

more follow ups in new preferences

Noemi Vanyi 9 年前
父节点
当前提交
5867e97966
共有 2 个文件被更改,包括 7 次插入12 次删除
  1. 1
    2
      searx/search.py
  2. 6
    10
      searx/webapp.py

+ 1
- 2
searx/search.py 查看文件

227
             # using user-defined default-configuration which
227
             # using user-defined default-configuration which
228
             # (is stored in cookie)
228
             # (is stored in cookie)
229
             if not self.categories:
229
             if not self.categories:
230
-                cookie_categories = request.cookies.get('categories', '')
231
-                cookie_categories = cookie_categories.split(',')
230
+                cookie_categories = request.preferences.get_value('categories')
232
                 for ccateg in cookie_categories:
231
                 for ccateg in cookie_categories:
233
                     if ccateg in categories:
232
                     if ccateg in categories:
234
                         self.categories.append(ccateg)
233
                         self.categories.append(ccateg)

+ 6
- 10
searx/webapp.py 查看文件

128
 def get_locale():
128
 def get_locale():
129
     locale = request.accept_languages.best_match(settings['locales'].keys())
129
     locale = request.accept_languages.best_match(settings['locales'].keys())
130
 
130
 
131
-    if settings['ui'].get('default_locale'):
132
-        locale = settings['ui']['default_locale']
133
-
134
-    if request.cookies.get('locale', '') in settings['locales']:
135
-        locale = request.cookies.get('locale', '')
131
+    if request.preferences.get_value('locale') != '':
132
+        locale = request.preferences.get_value('locale')
136
 
133
 
137
     if 'locale' in request.args\
134
     if 'locale' in request.args\
138
        and request.args['locale'] in settings['locales']:
135
        and request.args['locale'] in settings['locales']:
248
     if url.startswith('//'):
245
     if url.startswith('//'):
249
         url = 'https:' + url
246
         url = 'https:' + url
250
 
247
 
251
-    if not settings['server'].get('image_proxy') and not request.cookies.get('image_proxy'):
248
+    if not request.preferences.get_value('image_proxy'):
252
         return url
249
         return url
253
 
250
 
254
     hash_string = url + settings['server']['secret_key']
251
     hash_string = url + settings['server']['secret_key']
289
     if not kwargs['selected_categories']:
286
     if not kwargs['selected_categories']:
290
         cookie_categories = request.preferences.get_value('categories')
287
         cookie_categories = request.preferences.get_value('categories')
291
         for ccateg in cookie_categories:
288
         for ccateg in cookie_categories:
292
-            if ccateg in categories:
293
-                kwargs['selected_categories'].append(ccateg)
289
+            kwargs['selected_categories'].append(ccateg)
294
 
290
 
295
     if not kwargs['selected_categories']:
291
     if not kwargs['selected_categories']:
296
         kwargs['selected_categories'] = ['general']
292
         kwargs['selected_categories'] = ['general']
297
 
293
 
298
     if 'autocomplete' not in kwargs:
294
     if 'autocomplete' not in kwargs:
299
-        kwargs['autocomplete'] = autocomplete
295
+        kwargs['autocomplete'] = request.preferences.get_value('autocomplete')
300
 
296
 
301
     if get_locale() in rtl_locales and 'rtl' not in kwargs:
297
     if get_locale() in rtl_locales and 'rtl' not in kwargs:
302
         kwargs['rtl'] = True
298
         kwargs['rtl'] = True
501
     # normal autocompletion results only appear if max 3 inner results returned
497
     # normal autocompletion results only appear if max 3 inner results returned
502
     if len(raw_results) <= 3 and completer:
498
     if len(raw_results) <= 3 and completer:
503
         # get language from cookie
499
         # get language from cookie
504
-        language = request.cookies.get('language')
500
+        language = request.preferences.get_value('language')
505
         if not language or language == 'all':
501
         if not language or language == 'all':
506
             language = 'en'
502
             language = 'en'
507
         else:
503
         else: