11c2262 · searx · git.iko.soy

git.iko.soy/searx

Merge pull request #536 from kvch/general-minor-refactors

General minor refactors

commit11c2262055235751f7a42fe5053fae375f0efdf6 authorAdam Tauber <asciimoo@gmail.com> dateTue 12 Apr 2016, 13:53 (11 years ago) parentd27f7a1 adb1169

8 files changed+33−38

compare with master

unifiedsplit

searx/languages.py+2−2 searx/query.py+5−5 searx/search.py+4−5 searx/templates/courgette/preferences.html+1−1 searx/templates/default/preferences.html+1−1 searx/templates/oscar/preferences.html+2−2 searx/templates/pix-art/preferences.html+1−1 searx/webapp.py+17−21

searx/languages.py+2−2

@@ -20,10 +20,10 @@ language_codes = (

2020 ("ar_XA", "Arabic", "Arabia"),

2121 ("bg_BG", "Bulgarian", "Bulgaria"),

2222 ("cs_CZ", "Czech", "Czech Republic"),

23− ("de_DE", "German", "Germany"),

2423 ("da_DK", "Danish", "Denmark"),

2524 ("de_AT", "German", "Austria"),

2625 ("de_CH", "German", "Switzerland"),

26+ ("de_DE", "German", "Germany"),

2727 ("el_GR", "Greek", "Greece"),

2828 ("en_AU", "English", "Australia"),

2929 ("en_CA", "English", "Canada"),

@@ -58,10 +58,10 @@ language_codes = (

5858 ("ko_KR", "Korean", "Korea"),

5959 ("lt_LT", "Lithuanian", "Lithuania"),

6060 ("lv_LV", "Latvian", "Latvia"),

61− ("oc_OC", "Occitan", "Occitan"),

6261 ("nb_NO", "Norwegian", "Norway"),

6362 ("nl_BE", "Dutch", "Belgium"),

6463 ("nl_NL", "Dutch", "Netherlands"),

64+ ("oc_OC", "Occitan", "Occitan"),

6565 ("pl_PL", "Polish", "Poland"),

6666 ("pt_BR", "Portuguese", "Brazil"),

6767 ("pt_PT", "Portuguese", "Portugal"),

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+4−5

@@ -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

@@ -227,8 +227,7 @@ class Search(object):

227227 # using user-defined default-configuration which

228228 # (is stored in cookie)

229229 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')

232231 for ccateg in cookie_categories:

233232 if ccateg in categories:

234233 self.categories.append(ccateg)

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

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

245244 'name': engine.name}

246245 for engine in categories[categ]

247− if (engine.name, categ) not in self.blocked_engines)

246+ if (engine.name, categ) not in self.disabled_engines)

248247

249248 # remove suspended engines

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

searx/templates/courgette/preferences.html+1−1

@@ -109,7 +109,7 @@

109109 <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})&lrm;</td>

110110 <td>{{ _(categ) }}</td>

111111 <td class="engine_checkbox">

112− <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}__{{ categ }}"{% if (search_engine.name, categ) in blocked_engines %} checked="checked"{% endif %} />

112+ <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}__{{ categ }}"{% if (search_engine.name, categ) in disabled_engines %} checked="checked"{% endif %} />

113113 <label class="allow" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>

114114 <label class="deny" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>

115115 </td>

searx/templates/default/preferences.html+1−1

@@ -97,7 +97,7 @@

9797 <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})&lrm;</td>

9898 <td>{{ _(categ) }}</td>

9999 <td class="engine_checkbox">

100− <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}__{{ categ }}"{% if (search_engine.name, categ) in blocked_engines %} checked="checked"{% endif %} />

100+ <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}__{{ categ }}"{% if (search_engine.name, categ) in disabled_engines %} checked="checked"{% endif %} />

101101 <label class="allow" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>

102102 <label class="deny" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>

103103 </td>

searx/templates/oscar/preferences.html+2−2

@@ -157,7 +157,7 @@

157157 {% if not search_engine.private %}

158158 <tr>

159159 {% if not rtl %}

160− <td>{{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in blocked_engines) }}</td>

160+ <td>{{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }}</td>

161161 <th>{{ search_engine.name }}</th>

162162 <td>{{ shortcuts[search_engine.name] }}</td>

163163 <td><input type="checkbox" {{ "checked" if search_engine.safesearch==True else ""}} readonly="readonly" disabled="disabled"></td>

@@ -169,7 +169,7 @@

169169 <td><input type="checkbox" {{ "checked" if search_engine.safesearch==True else ""}} readonly="readonly" disabled="disabled"></td>

170170 <td>{{ shortcuts[search_engine.name] }}</td>

171171 <th>{{ search_engine.name }}</th>

172− <td>{{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in blocked_engines) }}</td>

172+ <td>{{ checkbox_toggle('engine_' + search_engine.name|replace(' ', '_') + '__' + categ|replace(' ', '_'), (search_engine.name, categ) in disabled_engines) }}</td>

173173 {% endif %}

174174 </tr>

175175 {% endif %}

searx/templates/pix-art/preferences.html+1−1

@@ -60,7 +60,7 @@

6060 <tr>

6161 <td>{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})&lrm;</td>

6262 <td class="engine_checkbox">

63− <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}__{{ categ }}"{% if (search_engine.name, categ) in blocked_engines %} checked="checked"{% endif %} />

63+ <input type="checkbox" id="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}__{{ categ }}"{% if (search_engine.name, categ) in disabled_engines %} checked="checked"{% endif %} />

6464 <label class="allow" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>

6565 <label class="deny" for="engine_{{ categ|replace(' ', '_') }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>

6666 </td>

searx/webapp.py+17−21

@@ -74,7 +74,7 @@ try:

7474 import pyasn1 # NOQA

7575except ImportError:

7676 logger.critical("The pyopenssl, ndg-httpsclient, pyasn1 packages have to be installed.\n"

77− "Some HTTPS connections will failed")

77+ "Some HTTPS connections will fail")

7878

7979

8080static_path, templates_path, themes =\

@@ -110,6 +110,7 @@ for indice, theme in enumerate(themes):

110110 for (dirpath, dirnames, filenames) in os.walk(theme_img_path):

111111 global_favicons[indice].extend(filenames)

112112

113+# used when translating category names

113114_category_names = (gettext('files'),

114115 gettext('general'),

115116 gettext('music'),

@@ -128,11 +129,8 @@ outgoing_proxies = settings['outgoing'].get('proxies', None)

128129def get_locale():

129130 locale = request.accept_languages.best_match(settings['locales'].keys())

130131

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', '')

132+ if request.preferences.get_value('locale') != '':

133+ locale = request.preferences.get_value('locale')

136134

137135 if 'locale' in request.args\

138136 and request.args['locale'] in settings['locales']:

@@ -248,7 +246,7 @@ def image_proxify(url):

248246 if url.startswith('//'):

249247 url = 'https:' + url

250248

251− if not settings['server'].get('image_proxy') and not request.cookies.get('image_proxy'):

249+ if not request.preferences.get_value('image_proxy'):

252250 return url

253251

254252 hash_string = url + settings['server']['secret_key']

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

259257

260258

261259def render(template_name, override_theme=None, **kwargs):

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

263− autocomplete = request.preferences.get_value('autocomplete')

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

264261

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)

262+ enabled_categories = set(category for engine_name in engines

263+ for category in engines[engine_name].categories

264+ if (engine_name, category) not in disabled_engines)

268265

269266 if 'categories' not in kwargs:

270267 kwargs['categories'] = ['general']

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

272269 sorted(categories.keys())

273270 if x != 'general'

274− and x in nonblocked_categories)

271+ and x in enabled_categories)

275272

276273 if 'all_categories' not in kwargs:

277274 kwargs['all_categories'] = ['general']

@@ -290,14 +287,13 @@ def render(template_name, override_theme=None, **kwargs):

290287 if not kwargs['selected_categories']:

291288 cookie_categories = request.preferences.get_value('categories')

292289 for ccateg in cookie_categories:

293− if ccateg in categories:

294− kwargs['selected_categories'].append(ccateg)

290+ kwargs['selected_categories'].append(ccateg)

295291

296292 if not kwargs['selected_categories']:

297293 kwargs['selected_categories'] = ['general']

298294

299295 if 'autocomplete' not in kwargs:

300− kwargs['autocomplete'] = autocomplete

296+ kwargs['autocomplete'] = request.preferences.get_value('autocomplete')

301297

302298 if get_locale() in rtl_locales and 'rtl' not in kwargs:

303299 kwargs['rtl'] = True

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

483479 request_data = request.args

484480

485481 # set blocked engines

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

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

487483

488484 # parse query

489− query = Query(request_data.get('q', '').encode('utf-8'), blocked_engines)

485+ query = Query(request_data.get('q', '').encode('utf-8'), disabled_engines)

490486 query.parse_query()

491487

492488 # check if search query is set

@@ -502,7 +498,7 @@ def autocompleter():

502498 # normal autocompletion results only appear if max 3 inner results returned

503499 if len(raw_results) <= 3 and completer:

504500 # get language from cookie

505− language = request.cookies.get('language')

501+ language = request.preferences.get_value('language')

506502 if not language or language == 'all':

507503 language = 'en'

508504 else:

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

544540 # render preferences

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

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

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

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

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

549545

550546 # stats for preferences page

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

572568 language_codes=language_codes,

573569 engines_by_category=categories,

574570 stats=stats,

575− blocked_engines=blocked_engines,

571+ disabled_engines=disabled_engines,

576572 autocomplete_backends=autocomplete_backends,

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

578574 themes=themes,