8c4db08 · searx · git.iko.soy

git.iko.soy/searx

rename blocked engines to diabled engines

commit8c4db08443c7a55344fa0011b89303467fa62efe authorNoemi Vanyi <sitbackandwait@gmail.com> dateSat 9 Apr 2016, 18:26 (11 years ago) parent006841c

3 files changed+17−18

compare with master

unifiedsplit

searx/query.py+5−5 searx/search.py+3−3 searx/webapp.py+9−10

searx/query.py+5−5

@@ -28,12 +28,12 @@ import re

2828class Query(object):

2929 """parse query"""

3030

31− def __init__(self, query, blocked_engines):

31+ def __init__(self, query, disabled_engines):

3232 self.query = query

33− self.blocked_engines = []

33+ self.disabled_engines = []

3434

35− if blocked_engines:

36− self.blocked_engines = blocked_engines

35+ if disabled_engines:

36+ self.disabled_engines = disabled_engines

3737

3838 self.query_parts = []

3939 self.engines = []

@@ -107,7 +107,7 @@ class Query(object):

107107 self.engines.extend({'category': prefix,

108108 'name': engine.name}

109109 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)

111111

112112 if query_part[0] == '!':

113113 self.specific = True

searx/search.py+3−3

@@ -140,7 +140,7 @@ class Search(object):

140140 self.lang = 'all'

141141

142142 # set blocked engines

143− self.blocked_engines = request.preferences.engines.get_disabled()

143+ self.disabled_engines = request.preferences.engines.get_disabled()

144144

145145 self.result_container = ResultContainer()

146146 self.request_data = {}

@@ -167,7 +167,7 @@ class Search(object):

167167

168168 # parse query, if tags are set, which change

169169 # 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)

171171 query_obj.parse_query()

172172

173173 # set query

@@ -244,7 +244,7 @@ class Search(object):

244244 self.engines.extend({'category': categ,

245245 'name': engine.name}

246246 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)

248248

249249 # remove suspended engines

250250 self.engines = [e for e in self.engines

searx/webapp.py+9−10

@@ -259,19 +259,18 @@ def image_proxify(url):

259259

260260

261261def 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()

264263

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)

268267

269268 if 'categories' not in kwargs:

270269 kwargs['categories'] = ['general']

271270 kwargs['categories'].extend(x for x in

272271 sorted(categories.keys())

273272 if x != 'general'

274− and x in nonblocked_categories)

273+ and x in enabled_categories)

275274

276275 if 'all_categories' not in kwargs:

277276 kwargs['all_categories'] = ['general']

@@ -483,10 +482,10 @@ def autocompleter():

483482 request_data = request.args

484483

485484 # set blocked engines

486− blocked_engines = request.preferences.engines.get_disabled()

485+ disabled_engines = request.preferences.engines.get_disabled()

487486

488487 # 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)

490489 query.parse_query()

491490

492491 # check if search query is set

@@ -544,7 +543,7 @@ def preferences():

544543 # render preferences

545544 image_proxy = request.preferences.get_value('image_proxy')

546545 lang = request.preferences.get_value('language')

547− blocked_engines = request.preferences.engines.get_disabled()

546+ disabled_engines = request.preferences.engines.get_disabled()

548547 allowed_plugins = request.preferences.plugins.get_enabled()

549548

550549 # stats for preferences page

@@ -572,7 +571,7 @@ def preferences():

572571 language_codes=language_codes,

573572 engines_by_category=categories,

574573 stats=stats,

575− blocked_engines=blocked_engines,

574+ blocked_engines=disabled_engines,

576575 autocomplete_backends=autocomplete_backends,

577576 shortcuts={y: x for x, y in engine_shortcuts.items()},

578577 themes=themes,