Browse Source

more follow ups in new preferences

Noemi Vanyi 9 years ago
parent
commit
5867e97966
2 changed files with 7 additions and 12 deletions
  1. 1
    2
      searx/search.py
  2. 6
    10
      searx/webapp.py

+ 1
- 2
searx/search.py View File

@@ -227,8 +227,7 @@ class Search(object):
227 227
             # using user-defined default-configuration which
228 228
             # (is stored in cookie)
229 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 231
                 for ccateg in cookie_categories:
233 232
                     if ccateg in categories:
234 233
                         self.categories.append(ccateg)

+ 6
- 10
searx/webapp.py View File

@@ -128,11 +128,8 @@ outgoing_proxies = settings['outgoing'].get('proxies', None)
128 128
 def get_locale():
129 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 134
     if 'locale' in request.args\
138 135
        and request.args['locale'] in settings['locales']:
@@ -248,7 +245,7 @@ def image_proxify(url):
248 245
     if url.startswith('//'):
249 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 249
         return url
253 250
 
254 251
     hash_string = url + settings['server']['secret_key']
@@ -289,14 +286,13 @@ def render(template_name, override_theme=None, **kwargs):
289 286
     if not kwargs['selected_categories']:
290 287
         cookie_categories = request.preferences.get_value('categories')
291 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 291
     if not kwargs['selected_categories']:
296 292
         kwargs['selected_categories'] = ['general']
297 293
 
298 294
     if 'autocomplete' not in kwargs:
299
-        kwargs['autocomplete'] = autocomplete
295
+        kwargs['autocomplete'] = request.preferences.get_value('autocomplete')
300 296
 
301 297
     if get_locale() in rtl_locales and 'rtl' not in kwargs:
302 298
         kwargs['rtl'] = True
@@ -501,7 +497,7 @@ def autocompleter():
501 497
     # normal autocompletion results only appear if max 3 inner results returned
502 498
     if len(raw_results) <= 3 and completer:
503 499
         # get language from cookie
504
-        language = request.cookies.get('language')
500
+        language = request.preferences.get_value('language')
505 501
         if not language or language == 'all':
506 502
             language = 'en'
507 503
         else: