浏览代码

[enh] image proxy config from preferences

Adam Tauber 10 年前
父节点
当前提交
f3d7af33fd
共有 1 个文件被更改,包括 7 次插入2 次删除
  1. 7
    2
      searx/webapp.py

+ 7
- 2
searx/webapp.py 查看文件

457
 
457
 
458
     Settings that are going to be saved as cookies."""
458
     Settings that are going to be saved as cookies."""
459
     lang = None
459
     lang = None
460
+    image_proxy = request.cookies.get('image_proxy', settings['server'].get('image_proxy'))
460
 
461
 
461
     if request.cookies.get('language')\
462
     if request.cookies.get('language')\
462
        and request.cookies['language'] in (x[0] for x in language_codes):
463
        and request.cookies['language'] in (x[0] for x in language_codes):
479
                 selected_categories.append(category)
480
                 selected_categories.append(category)
480
             elif pd_name == 'locale' and pd in settings['locales']:
481
             elif pd_name == 'locale' and pd in settings['locales']:
481
                 locale = pd
482
                 locale = pd
483
+            elif pd_name == 'image_proxy':
484
+                image_proxy = pd
482
             elif pd_name == 'autocomplete':
485
             elif pd_name == 'autocomplete':
483
                 autocomplete = pd
486
                 autocomplete = pd
484
             elif pd_name == 'language' and (pd == 'all' or
487
             elif pd_name == 'language' and (pd == 'all' or
530
 
533
 
531
         resp.set_cookie('method', method, max_age=cookie_max_age)
534
         resp.set_cookie('method', method, max_age=cookie_max_age)
532
 
535
 
533
-        resp.set_cookie(
534
-            'theme', theme, max_age=cookie_max_age)
536
+        resp.set_cookie('image_proxy', image_proxy, max_age=cookie_max_age)
537
+
538
+        resp.set_cookie('theme', theme, max_age=cookie_max_age)
535
 
539
 
536
         return resp
540
         return resp
537
     return render('preferences.html',
541
     return render('preferences.html',
538
                   locales=settings['locales'],
542
                   locales=settings['locales'],
539
                   current_locale=get_locale(),
543
                   current_locale=get_locale(),
540
                   current_language=lang or 'all',
544
                   current_language=lang or 'all',
545
+                  image_proxy = image_proxy,
541
                   language_codes=language_codes,
546
                   language_codes=language_codes,
542
                   categs=categories.items(),
547
                   categs=categories.items(),
543
                   blocked_engines=blocked_engines,
548
                   blocked_engines=blocked_engines,