diff options
| author | Noemi Vanyi <sitbackandwait@gmail.com> | 2016-04-09 18:26:29 +0200 |
|---|---|---|
| committer | Noemi Vanyi <sitbackandwait@gmail.com> | 2016-04-09 19:49:59 +0200 |
| commit | 8c4db08443c7a55344fa0011b89303467fa62efe (patch) | |
| tree | b69569e5764823ef8fc40318f9188db54456921c /searx/webapp.py | |
| parent | 006841c4ff481b023dccd188582a9cbac64415da (diff) | |
rename blocked engines to diabled engines
Diffstat (limited to 'searx/webapp.py')
| -rw-r--r-- | searx/webapp.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/searx/webapp.py b/searx/webapp.py index 5b15c43d1..1420906f5 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -259,19 +259,18 @@ def image_proxify(url): def render(template_name, override_theme=None, **kwargs): - blocked_engines = request.preferences.engines.get_disabled() - autocomplete = request.preferences.get_value('autocomplete') + disabled_engines = request.preferences.engines.get_disabled() - nonblocked_categories = set(category for engine_name in engines - for category in engines[engine_name].categories - if (engine_name, category) not in blocked_engines) + enabled_categories = set(category for engine_name in engines + for category in engines[engine_name].categories + if (engine_name, category) not in disabled_engines) if 'categories' not in kwargs: kwargs['categories'] = ['general'] kwargs['categories'].extend(x for x in sorted(categories.keys()) if x != 'general' - and x in nonblocked_categories) + and x in enabled_categories) if 'all_categories' not in kwargs: kwargs['all_categories'] = ['general'] @@ -483,10 +482,10 @@ def autocompleter(): request_data = request.args # set blocked engines - blocked_engines = request.preferences.engines.get_disabled() + disabled_engines = request.preferences.engines.get_disabled() # parse query - query = Query(request_data.get('q', '').encode('utf-8'), blocked_engines) + query = Query(request_data.get('q', '').encode('utf-8'), disabled_engines) query.parse_query() # check if search query is set @@ -544,7 +543,7 @@ def preferences(): # render preferences image_proxy = request.preferences.get_value('image_proxy') lang = request.preferences.get_value('language') - blocked_engines = request.preferences.engines.get_disabled() + disabled_engines = request.preferences.engines.get_disabled() allowed_plugins = request.preferences.plugins.get_enabled() # stats for preferences page @@ -572,7 +571,7 @@ def preferences(): language_codes=language_codes, engines_by_category=categories, stats=stats, - blocked_engines=blocked_engines, + blocked_engines=disabled_engines, autocomplete_backends=autocomplete_backends, shortcuts={y: x for x, y in engine_shortcuts.items()}, themes=themes, |