Преглед изворни кода

rename blocked engines to diabled engines

Noemi Vanyi пре 9 година
родитељ
комит
8c4db08443
3 измењених фајлова са 17 додато и 18 уклоњено
  1. 5
    5
      searx/query.py
  2. 3
    3
      searx/search.py
  3. 9
    10
      searx/webapp.py

+ 5
- 5
searx/query.py Прегледај датотеку

28
 class Query(object):
28
 class Query(object):
29
     """parse query"""
29
     """parse query"""
30
 
30
 
31
-    def __init__(self, query, blocked_engines):
31
+    def __init__(self, query, disabled_engines):
32
         self.query = query
32
         self.query = query
33
-        self.blocked_engines = []
33
+        self.disabled_engines = []
34
 
34
 
35
-        if blocked_engines:
36
-            self.blocked_engines = blocked_engines
35
+        if disabled_engines:
36
+            self.disabled_engines = disabled_engines
37
 
37
 
38
         self.query_parts = []
38
         self.query_parts = []
39
         self.engines = []
39
         self.engines = []
107
                     self.engines.extend({'category': prefix,
107
                     self.engines.extend({'category': prefix,
108
                                          'name': engine.name}
108
                                          'name': engine.name}
109
                                         for engine in categories[prefix]
109
                                         for engine in categories[prefix]
110
-                                        if (engine.name, prefix) not in self.blocked_engines)
110
+                                        if (engine.name, prefix) not in self.disabled_engines)
111
 
111
 
112
             if query_part[0] == '!':
112
             if query_part[0] == '!':
113
                 self.specific = True
113
                 self.specific = True

+ 3
- 3
searx/search.py Прегледај датотеку

140
         self.lang = 'all'
140
         self.lang = 'all'
141
 
141
 
142
         # set blocked engines
142
         # set blocked engines
143
-        self.blocked_engines = request.preferences.engines.get_disabled()
143
+        self.disabled_engines = request.preferences.engines.get_disabled()
144
 
144
 
145
         self.result_container = ResultContainer()
145
         self.result_container = ResultContainer()
146
         self.request_data = {}
146
         self.request_data = {}
167
 
167
 
168
         # parse query, if tags are set, which change
168
         # parse query, if tags are set, which change
169
         # the serch engine or search-language
169
         # the serch engine or search-language
170
-        query_obj = Query(self.request_data['q'], self.blocked_engines)
170
+        query_obj = Query(self.request_data['q'], self.disabled_engines)
171
         query_obj.parse_query()
171
         query_obj.parse_query()
172
 
172
 
173
         # set query
173
         # set query
244
                 self.engines.extend({'category': categ,
244
                 self.engines.extend({'category': categ,
245
                                      'name': engine.name}
245
                                      'name': engine.name}
246
                                     for engine in categories[categ]
246
                                     for engine in categories[categ]
247
-                                    if (engine.name, categ) not in self.blocked_engines)
247
+                                    if (engine.name, categ) not in self.disabled_engines)
248
 
248
 
249
         # remove suspended engines
249
         # remove suspended engines
250
         self.engines = [e for e in self.engines
250
         self.engines = [e for e in self.engines

+ 9
- 10
searx/webapp.py Прегледај датотеку

259
 
259
 
260
 
260
 
261
 def render(template_name, override_theme=None, **kwargs):
261
 def render(template_name, override_theme=None, **kwargs):
262
-    blocked_engines = request.preferences.engines.get_disabled()
263
-    autocomplete = request.preferences.get_value('autocomplete')
262
+    disabled_engines = request.preferences.engines.get_disabled()
264
 
263
 
265
-    nonblocked_categories = set(category for engine_name in engines
266
-                                for category in engines[engine_name].categories
267
-                                if (engine_name, category) not in blocked_engines)
264
+    enabled_categories = set(category for engine_name in engines
265
+                             for category in engines[engine_name].categories
266
+                             if (engine_name, category) not in disabled_engines)
268
 
267
 
269
     if 'categories' not in kwargs:
268
     if 'categories' not in kwargs:
270
         kwargs['categories'] = ['general']
269
         kwargs['categories'] = ['general']
271
         kwargs['categories'].extend(x for x in
270
         kwargs['categories'].extend(x for x in
272
                                     sorted(categories.keys())
271
                                     sorted(categories.keys())
273
                                     if x != 'general'
272
                                     if x != 'general'
274
-                                    and x in nonblocked_categories)
273
+                                    and x in enabled_categories)
275
 
274
 
276
     if 'all_categories' not in kwargs:
275
     if 'all_categories' not in kwargs:
277
         kwargs['all_categories'] = ['general']
276
         kwargs['all_categories'] = ['general']
483
         request_data = request.args
482
         request_data = request.args
484
 
483
 
485
     # set blocked engines
484
     # set blocked engines
486
-    blocked_engines = request.preferences.engines.get_disabled()
485
+    disabled_engines = request.preferences.engines.get_disabled()
487
 
486
 
488
     # parse query
487
     # parse query
489
-    query = Query(request_data.get('q', '').encode('utf-8'), blocked_engines)
488
+    query = Query(request_data.get('q', '').encode('utf-8'), disabled_engines)
490
     query.parse_query()
489
     query.parse_query()
491
 
490
 
492
     # check if search query is set
491
     # check if search query is set
544
     # render preferences
543
     # render preferences
545
     image_proxy = request.preferences.get_value('image_proxy')
544
     image_proxy = request.preferences.get_value('image_proxy')
546
     lang = request.preferences.get_value('language')
545
     lang = request.preferences.get_value('language')
547
-    blocked_engines = request.preferences.engines.get_disabled()
546
+    disabled_engines = request.preferences.engines.get_disabled()
548
     allowed_plugins = request.preferences.plugins.get_enabled()
547
     allowed_plugins = request.preferences.plugins.get_enabled()
549
 
548
 
550
     # stats for preferences page
549
     # stats for preferences page
572
                   language_codes=language_codes,
571
                   language_codes=language_codes,
573
                   engines_by_category=categories,
572
                   engines_by_category=categories,
574
                   stats=stats,
573
                   stats=stats,
575
-                  blocked_engines=blocked_engines,
574
+                  blocked_engines=disabled_engines,
576
                   autocomplete_backends=autocomplete_backends,
575
                   autocomplete_backends=autocomplete_backends,
577
                   shortcuts={y: x for x, y in engine_shortcuts.items()},
576
                   shortcuts={y: x for x, y in engine_shortcuts.items()},
578
                   themes=themes,
577
                   themes=themes,