a6f20ca · searx · git.iko.soy

git.iko.soy/searx

add initial support for offline engines && command engine

commita6f20caf32af463b57a026ee7cb7ed6317db6b8b authorNoémi Ványi <sitbackandwait@gmail.com> dateMon 23 Sep 2019, 17:14 (7 years ago) parent2946c5f

19 files changed+228−61

compare with master

unifiedsplit

searx/engines/__init__.py+16−12 searx/engines/soundcloud.py+1−1 searx/engines/wolframalpha_noapi.py+1−1 searx/plugins/https_rewrite.py+3 searx/plugins/oa_doi_rewrite.py+3 searx/plugins/tracker_url_remover.py+3 searx/results.py+45−29 searx/search.py+61−13 searx/static/themes/courgette/css/style.css+1−1 searx/static/themes/courgette/less/style.less+4 searx/static/themes/legacy/css/style.css+1−1 searx/static/themes/legacy/less/style.less+4 searx/templates/courgette/result_templates/key-value.html+13 searx/templates/legacy/result_templates/key-value.html+13 searx/templates/oscar/macros.html+9−1 searx/templates/oscar/result_templates/key-value.html+19 searx/templates/simple/result_templates/key-value.html+11 searx/utils.py+15 searx/webapp.py+5−2

searx/engines/__init__.py+16−12

@@ -27,7 +27,7 @@ from json import loads

2727from requests import get

2828from searx import settings

2929from searx import logger

30−from searx.utils import load_module, match_language

30+from searx.utils import load_module, match_language, get_engine_from_settings

3131

3232

3333logger = logger.getChild('engines')

@@ -53,7 +53,8 @@ engine_default_args = {'paging': False,

5353 'disabled': False,

5454 'suspend_end_time': 0,

5555 'continuous_errors': 0,

56− 'time_range_support': False}

56+ 'time_range_support': False,

57+ 'offline': False}

5758

5859

5960def load_engine(engine_data):

@@ -128,14 +129,17 @@ def load_engine(engine_data):

128129 engine.stats = {

129130 'result_count': 0,

130131 'search_count': 0,

131− 'page_load_time': 0,

132− 'page_load_count': 0,

133132 'engine_time': 0,

134133 'engine_time_count': 0,

135134 'score_count': 0,

136135 'errors': 0

137136 }

138137

138+ if not engine.offline:

139+ engine.stats['page_load_time'] = 0

140+ engine.stats['page_load_count'] = 0

141+

142+

139143 for category_name in engine.categories:

140144 categories.setdefault(category_name, []).append(engine)

141145

@@ -173,11 +177,6 @@ def get_engines_stats():

173177 results_num = \

174178 engine.stats['result_count'] / float(engine.stats['search_count'])

175179

176− if engine.stats['page_load_count'] != 0:

177− load_times = engine.stats['page_load_time'] / float(engine.stats['page_load_count']) # noqa

178− else:

179− load_times = 0

180−

181180 if engine.stats['engine_time_count'] != 0:

182181 this_engine_time = engine.stats['engine_time'] / float(engine.stats['engine_time_count']) # noqa

183182 else:

@@ -189,14 +188,19 @@ def get_engines_stats():

189188 else:

190189 score = score_per_result = 0.0

191190

192− max_pageload = max(load_times, max_pageload)

191+ if not engine.offline:

192+ load_times = 0

193+ if engine.stats['page_load_count'] != 0:

194+ load_times = engine.stats['page_load_time'] / float(engine.stats['page_load_count']) # noqa

195+ max_pageload = max(load_times, max_pageload)

196+ pageloads.append({'avg': load_times, 'name': engine.name})

197+

193198 max_engine_times = max(this_engine_time, max_engine_times)

194199 max_results = max(results_num, max_results)

195200 max_score = max(score, max_score)

196201 max_score_per_result = max(score_per_result, max_score_per_result)

197202 max_errors = max(max_errors, engine.stats['errors'])

198203

199− pageloads.append({'avg': load_times, 'name': engine.name})

200204 engine_times.append({'avg': this_engine_time, 'name': engine.name})

201205 results.append({'avg': results_num, 'name': engine.name})

202206 scores.append({'avg': score, 'name': engine.name})

@@ -255,7 +259,7 @@ def initialize_engines(engine_list):

255259 load_engines(engine_list)

256260

257261 def engine_init(engine_name, init_fn):

258− init_fn()

262+ init_fn(get_engine_from_settings(engine_name))

259263 logger.debug('%s engine: Initialized', engine_name)

260264

261265 for engine_name, engine in engines.items():

searx/engines/soundcloud.py+1−1

@@ -66,7 +66,7 @@ def get_client_id():

6666 return ""

6767

6868

69−def init():

69+def init(engine_settings=None):

7070 global guest_client_id

7171 # api-key

7272 guest_client_id = get_client_id()

searx/engines/wolframalpha_noapi.py+1−1

@@ -55,7 +55,7 @@ def obtain_token():

5555 return token

5656

5757

58−def init():

58+def init(engine_settings=None):

5959 obtain_token()

6060

6161

searx/plugins/https_rewrite.py+3

@@ -225,6 +225,9 @@ def https_url_rewrite(result):

225225

226226

227227def on_result(request, search, result):

228+ if 'parsed_url' not in result:

229+ return True

230+

228231 if result['parsed_url'].scheme == 'http':

229232 https_url_rewrite(result)

230233 return True

searx/plugins/oa_doi_rewrite.py+3

@@ -35,6 +35,9 @@ def get_doi_resolver(args, preference_doi_resolver):

3535

3636

3737def on_result(request, search, result):

38+ if 'parsed_url' not in result:

39+ return True

40+

3841 doi = extract_doi(result['parsed_url'])

3942 if doi and len(doi) < 50:

4043 for suffix in ('/', '.pdf', '/full', '/meta', '/abstract'):

searx/plugins/tracker_url_remover.py+3

@@ -30,6 +30,9 @@ preference_section = 'privacy'

3030

3131

3232def on_result(request, search, result):

33+ if 'parsed_url' not in result:

34+ return True

35+

3336 query = result['parsed_url'].query

3437

3538 if query == "":

searx/results.py+45−29

@@ -197,6 +197,13 @@ class ResultContainer(object):

197197 self.infoboxes.append(infobox)

198198

199199 def _merge_result(self, result, position):

200+ if 'url' in result:

201+ self.__merge_url_result(result, position)

202+ return

203+

204+ self.__merge_result_no_url(result, position)

205+

206+ def __merge_url_result(self, result, position):

200207 result['parsed_url'] = urlparse(result['url'])

201208

202209 # if the result has no scheme, use http as default

@@ -210,51 +217,60 @@ class ResultContainer(object):

210217 if result.get('content'):

211218 result['content'] = WHITESPACE_REGEX.sub(' ', result['content'])

212219

213− # check for duplicates

214− duplicated = False

220+ duplicated = self.__find_duplicated_http_result(result)

221+ if duplicated:

222+ self.__merge_duplicated_http_result(duplicated, result, position)

223+ return

224+

225+ # if there is no duplicate found, append result

226+ result['positions'] = [position]

227+ with RLock():

228+ self._merged_results.append(result)

229+

230+ def __find_duplicated_http_result(self, result):

215231 result_template = result.get('template')

216232 for merged_result in self._merged_results:

233+ if 'parsed_url' not in merged_result:

234+ continue

217235 if compare_urls(result['parsed_url'], merged_result['parsed_url'])\

218236 and result_template == merged_result.get('template'):

219237 if result_template != 'images.html':

220238 # not an image, same template, same url : it's a duplicate

221− duplicated = merged_result

222− break

239+ return merged_result

223240 else:

224241 # it's an image

225242 # it's a duplicate if the parsed_url, template and img_src are differents

226243 if result.get('img_src', '') == merged_result.get('img_src', ''):

227− duplicated = merged_result

228− break

244+ return merged_result

245+ return None

229246

230− # merge duplicates together

231− if duplicated:

232− # using content with more text

233− if result_content_len(result.get('content', '')) >\

234− result_content_len(duplicated.get('content', '')):

235− duplicated['content'] = result['content']

247+ def __merge_duplicated_http_result(self, duplicated, result, position):

248+ # using content with more text

249+ if result_content_len(result.get('content', '')) >\

250+ result_content_len(duplicated.get('content', '')):

251+ duplicated['content'] = result['content']

236252

237− # merge all result's parameters not found in duplicate

238− for key in result.keys():

239− if not duplicated.get(key):

240− duplicated[key] = result.get(key)

253+ # merge all result's parameters not found in duplicate

254+ for key in result.keys():

255+ if not duplicated.get(key):

256+ duplicated[key] = result.get(key)

241257

242− # add the new position

243− duplicated['positions'].append(position)

258+ # add the new position

259+ duplicated['positions'].append(position)

244260

245− # add engine to list of result-engines

246− duplicated['engines'].add(result['engine'])

261+ # add engine to list of result-engines

262+ duplicated['engines'].add(result['engine'])

247263

248− # using https if possible

249− if duplicated['parsed_url'].scheme != 'https' and result['parsed_url'].scheme == 'https':

250− duplicated['url'] = result['parsed_url'].geturl()

251− duplicated['parsed_url'] = result['parsed_url']

264+ # using https if possible

265+ if duplicated['parsed_url'].scheme != 'https' and result['parsed_url'].scheme == 'https':

266+ duplicated['url'] = result['parsed_url'].geturl()

267+ duplicated['parsed_url'] = result['parsed_url']

252268

253− # if there is no duplicate found, append result

254− else:

255− result['positions'] = [position]

256− with RLock():

257− self._merged_results.append(result)

269+ def __merge_result_no_url(self, result, position):

270+ result['engines'] = set([result['engine']])

271+ result['positions'] = [position]

272+ with RLock():

273+ self._merged_results.append(result)

258274

259275 def order_results(self):

260276 for result in self._merged_results:

searx/search.py+61−13

@@ -77,7 +77,7 @@ def send_http_request(engine, request_params):

7777 return req(request_params['url'], **request_args)

7878

7979

80−def search_one_request(engine, query, request_params):

80+def search_one_http_request(engine, query, request_params):

8181 # update request parameters dependent on

8282 # search-engine (contained in engines folder)

8383 engine.request(query, request_params)

@@ -97,7 +97,53 @@ def search_one_request(engine, query, request_params):

9797 return engine.response(response)

9898

9999

100+def search_one_offline_request(engine, query, request_params):

101+ return engine.search(query, request_params)

102+

103+

100104def search_one_request_safe(engine_name, query, request_params, result_container, start_time, timeout_limit):

105+ if engines[engine_name].offline:

106+ return search_one_offline_request_safe(engine_name, query, request_params, result_container, start_time, timeout_limit)

107+ return search_one_http_request_safe(engine_name, query, request_params, result_container, start_time, timeout_limit)

108+

109+

110+def search_one_offline_request_safe(engine_name, query, request_params, result_container, start_time, timeout_limit):

111+ engine = engines[engine_name]

112+

113+ try:

114+ search_results = search_one_offline_request(engine, query, request_params)

115+

116+ if search_results:

117+ result_container.extend(engine_name, search_results)

118+

119+ engine_time = time() - start_time

120+ result_container.add_timing(engine_name, engine_time, engine_time)

121+ with threading.RLock():

122+ engine.stats['engine_time'] += engine_time

123+ engine.stats['engine_time_count'] += 1

124+

125+ except ValueError as e:

126+ record_offline_engine_stats_on_error(engine, result_container, start_time)

127+ logger.exception('engine {0} : invalid input : {1}'.format(engine_name, e))

128+ except Exception as e:

129+ record_offline_engine_stats_on_error(engine, result_container, start_time)

130+

131+ result_container.add_unresponsive_engine((

132+ engine_name,

133+ u'{0}: {1}'.format(gettext('unexpected crash'), e),

134+ ))

135+ logger.exception('engine {0} : exception : {1}'.format(engine_name, e))

136+

137+

138+def record_offline_engine_stats_on_error(engine, result_container, start_time):

139+ engine_time = time() - start_time

140+ result_container.add_timing(engine.name, engine_time, engine_time)

141+

142+ with threading.RLock():

143+ engine.stats['errors'] += 1

144+

145+

146+def search_one_http_request_safe(engine_name, query, request_params, result_container, start_time, timeout_limit):

101147 # set timeout for all HTTP requests

102148 requests_lib.set_timeout_for_thread(timeout_limit, start_time=start_time)

103149 # reset the HTTP total time

@@ -111,7 +157,7 @@ def search_one_request_safe(engine_name, query, request_params, result_container

111157

112158 try:

113159 # send requests and parse the results

114− search_results = search_one_request(engine, query, request_params)

160+ search_results = search_one_http_request(engine, query, request_params)

115161

116162 # check if the engine accepted the request

117163 if search_results is not None:

@@ -427,19 +473,21 @@ class Search(object):

427473 continue

428474

429475 # set default request parameters

430− request_params = default_request_params()

431− request_params['headers']['User-Agent'] = user_agent

432− request_params['category'] = selected_engine['category']

433− request_params['pageno'] = search_query.pageno

476+ request_params = {}

477+ if not engine.offline:

478+ request_params = default_request_params()

479+ request_params['headers']['User-Agent'] = user_agent

434480

435− if hasattr(engine, 'language') and engine.language:

436− request_params['language'] = engine.language

437− else:

438− request_params['language'] = search_query.lang

481+ if hasattr(engine, 'language') and engine.language:

482+ request_params['language'] = engine.language

483+ else:

484+ request_params['language'] = search_query.lang

439485

440− # 0 = None, 1 = Moderate, 2 = Strict

441− request_params['safesearch'] = search_query.safesearch

442− request_params['time_range'] = search_query.time_range

486+ request_params['safesearch'] = search_query.safesearch

487+ request_params['time_range'] = search_query.time_range

488+

489+ request_params['category'] = selected_engine['category']

490+ request_params['pageno'] = search_query.pageno

443491

444492 # append request to list

445493 requests.append((selected_engine['name'], search_query.query, request_params))

searx/static/themes/courgette/css/style.css+1−1

@@ -1 +1 @@

1−a,h2{color:#666}.center,html{position:relative}#categories_container>div,.top_margin a{display:inline-block}#categories,.center{text-align:center}#categories .hidden,.cache_link,.highlight .c,.highlight .cm,.highlight .ge,.highlight .sd{font-style:italic}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=search]{-webkit-appearance:textfield}h2{text-transform:uppercase}body{font-family:sans-serif;line-height:1.5;margin:0;background:#EEE}html{min-height:100%}.title h1{font-size:7em;color:#3498DB;margin:-20px auto 0;line-height:100px;padding-bottom:20px}.center{max-width:70em;background:rgba(255,255,255,.6);padding:2em;margin:7% auto 0}.center.search{position:static;width:auto;background:0 0;margin:auto;padding-top:1.8em}@media screen and (min-width:1001px){.center:after{content:"";z-index:-1;background:url(../img/bg-body-index.jpg) no-repeat;background-size:cover;width:100%;height:100%;top:0;left:0;position:fixed}.center.search:after{content:none}}.autocompleter-choices{position:absolute;margin:0;padding:0;background:#FFF}.autocompleter-choices li{padding:.5em 1em}.autocompleter-choices li:hover{background:#3498DB;color:#FFF;cursor:pointer}.top_margin{position:absolute;bottom:-3.5em;width:100%;left:0}.top_margin a{margin-right:1em;color:#FFF;text-decoration:none}.top_margin a:focus,.top_margin a:hover{text-decoration:underline}@media screen and (max-width:1000px){.center{background:0 0}.top_margin a{color:#333}}.checkbox_container{margin-top:1.5em}.checkbox_container label{padding:.5em 1em;color:#333;cursor:pointer;font-size:.9em}.checkbox_container input[type=checkbox]:checked+label,.checkbox_container label:hover{background:#3498DB;color:#FFF}.checkbox_container input[type=checkbox]{position:absolute;top:-9999px}#categories .hidden{display:none;position:absolute;bottom:1em;left:0;text-align:center;width:100%;font-size:.9em;color:#333}#categories:hover .hidden,.right a{display:block}@media screen and (max-width:900px){#categories_container{letter-spacing:-5px}#categories_container>div{letter-spacing:normal;margin-top:1em}.checkbox_container{margin:0}.checkbox_container label{display:block;background:#CCC;padding:1em;border:1px solid #FFF}.top_margin{position:static}#categories .hidden{position:static;display:block}}@media screen and (max-width:900px) and (min-width:501px){#categories_container>div{width:31%;margin-left:2.333%}#categories_container>div:nth-child(3n+1){margin-left:0}}@media screen and (max-width:500px){#categories_container>div{width:48%;margin-left:2%;font-size:.9em}#categories_container>div:nth-child(2n+1){margin-left:0}.title h1{background:url(../img/searx-mobile.png) no-repeat;width:200px;height:39px}}#search_wrapper{position:relative}.q{padding:.5em 3em .5em 1em;width:100%;font-size:1.5em;border:0;color:#666}.cache_link,.result p{font-size:.9em}#search_submit{position:absolute;top:0;right:0;border:0;background:url(../img/search-icon.png) center center/65% auto no-repeat #3498DB;text-indent:-9999px;width:5em;height:100%;cursor:pointer}#sidebar,.right{position:fixed;width:15em;right:0;text-align:right}#search_submit:focus,#search_submit:hover{background-color:#0665A2}#sidebar{background:#3498DB;top:0;height:100%;padding:1.5em}.right{bottom:1.5em;z-index:1;padding:0 1.5em}.right a{color:#FFF;text-decoration:none}#sidebar form,#suggestions form,.row fieldset{display:inline-block}.right a:focus,.right a:hover{text-decoration:underline}#preferences{background:url(../img/preference-icon.png) right center/12% auto no-repeat;padding-right:1.8em}#search_url input{border:0;padding:.5em}#sidebar>div{margin-bottom:1em;color:#FFF}#sidebar input[type=submit]{background:#CCC;border:0;padding:.5em 1em;cursor:pointer;margin-top:.5em}#sidebar input[type=submit]:focus,#sidebar input[type=submit]:hover{color:#FFF;background-color:#0665A2}#results{padding:0 17em 0 2em}.result .content{margin:0;color:#666}.result .url{margin-top:0;color:#FF6530}.result .favicon{float:left;position:relative;top:.5em;margin-right:.5em}.definition_result{background:#CCC;padding:1em}.definition_result .result_title,.definition_result p{margin:0}.result_title{margin-bottom:0;font-weight:400}.result_title a{color:#3498DB;text-decoration:none}#answers,#suggestions span{color:#666}.result_title a:focus,.result_title a:hover{text-decoration:underline}.cache_link{color:#666}.search.center{padding-right:17em}#answers{border:2px solid #3498DB;padding:20px;text-align:center;max-width:70em;margin:0 auto 20px}#suggestions{margin-bottom:1em}#suggestions form{vertical-align:top;margin-bottom:.5em}#suggestions input[type=submit]{color:#333;padding:.5em 1em;border:0;background:#CCC;cursor:pointer}#suggestions input[type=submit]:focus,#suggestions input[type=submit]:hover{background:#3498DB;color:#FFF}#pagination{margin:1.5em 0 2em}#pagination form+form{float:right;margin-top:-2em}input[type=submit]{display:inline-block;background:#3498DB;color:#FFF;border:0;padding:.6em 1em;cursor:pointer}input[type=submit]:focus,input[type=submit]:hover{background:#0665A2}.row{max-width:60em;margin:auto}.row a{color:#3498DB}.row form{letter-spacing:-5px}.row form>*{letter-spacing:normal}.row p{margin:0}.row fieldset{width:48%;vertical-align:top}.row fieldset:last-of-type{display:block;width:auto;background:0 0;padding:0}fieldset,table tr:nth-child(odd){background:#CCC}.row fieldset:nth-child(odd){margin-right:2%}.row fieldset:nth-child(2){min-height:10.5em}@media screen and (max-width:900px){.row{margin:0 1em}.row fieldset{width:49%}.row fieldset,.row fieldset:nth-child(odd){margin-right:0}.row fieldset:first-child{width:100%;margin-right:0}.row fieldset:nth-child(even){margin-right:2%}}@media screen and (max-width:800px){.row fieldset,select{width:100%}table{font-size:.8em}#sidebar,.right{display:none}#results{padding:0 2em}.search.center{padding-right:2em}}@media screen and (max-width:400px){.row #categories_container>div{width:100%;margin-left:0}}fieldset{border:0;margin:1em 0;padding:1.5em}table{width:100%;text-align:left;border:1px solid #CCC;border-collapse:collapse}table th{background:#999;color:#FFF}table td,table th{padding:.5em 1em;border:1px solid #FFF}.engine_checkbox label{padding:.5em;background:#3498DB;color:#FFF;cursor:pointer}.engine_checkbox .deny{background:#3498DB}.engine_checkbox .allow{display:none;background:#666}.engine_checkbox input{display:none}.engine_checkbox input:checked+.allow{display:inline}.engine_checkbox input:checked+.allow+.deny{display:none}.row input[type=submit]{font-size:1em;margin:1em 0 2em}.row .right{position:static;display:inline-block}.row .right a{color:#333;width:auto;text-align:left;padding:0}.small_font{font-size:.8em}table th{padding:1em}legend{background:#EEE;padding:0 1em;position:relative}select{border:1px solid #DDD;padding:.5em .8em;font-size:1em}.highlight .hll{background-color:#ffc}.highlight{font-weight:700;background:#f8f8f8}.highlight .c{color:#408080}.highlight .err{border:1px solid red}.highlight .k{color:green;font-weight:700}.highlight .o{color:#666}.highlight .cm{color:#408080}.highlight .cp{color:#BC7A00}.highlight .c1,.highlight .cs{color:#408080;font-style:italic}.highlight .gd{color:#A00000}.highlight .gr{color:red}.highlight .gh{color:navy;font-weight:700}.highlight .gi{color:#00A000}.highlight .go{color:#888}.highlight .gp{color:navy;font-weight:700}.highlight .gs{font-weight:700}.highlight .gu{color:purple;font-weight:700}.highlight .gt{color:#04D}.highlight .kc,.highlight .kd,.highlight .kn{color:green;font-weight:700}.highlight .kp{color:green}.highlight .kr{color:green;font-weight:700}.highlight .kt{color:#B00040}.highlight .m{color:#666}.highlight .s{color:#BA2121}.highlight .na{color:#7D9029}.highlight .nb{color:green}.highlight .nc{color:#00F;font-weight:700}.highlight .no{color:#800}.highlight .nd{color:#A2F}.highlight .ni{color:#999;font-weight:700}.highlight .ne{color:#D2413A;font-weight:700}.highlight .nf{color:#00F}.highlight .nl{color:#A0A000}.highlight .nn{color:#00F;font-weight:700}.highlight .nt{color:green;font-weight:700}.highlight .nv{color:#19177C}.highlight .ow{color:#A2F;font-weight:700}.highlight .w{color:#bbb}.highlight .mf,.highlight .mh,.highlight .mi,.highlight .mo{color:#666}.highlight .s2,.highlight .sb,.highlight .sc{color:#BA2121}.highlight .sd{color:#BA2121}.highlight .se{color:#B62;font-weight:700}.highlight .sh{color:#BA2121}.highlight .si{color:#B68;font-weight:700}.highlight .sx{color:green}.highlight .sr{color:#B68}.highlight .s1{color:#BA2121}.highlight .ss{color:#19177C}.highlight .bp{color:green}.highlight .vc,.highlight .vg,.highlight .vi{color:#19177C}.highlight .il{color:#666}.highlight pre{overflow:auto}.highlight .lineno{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:default}.highlight .lineno::selection{background:0 0}.highlight .lineno::-moz-selection{background:0 0}

1+a,h2{color:#666}.center,html{position:relative}#categories_container>div,.top_margin a{display:inline-block}#categories,.center{text-align:center}#categories .hidden,.cache_link,.highlight .c,.highlight .cm,.highlight .ge,.highlight .sd{font-style:italic}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=search]{-webkit-appearance:textfield}h2{text-transform:uppercase}body{font-family:sans-serif;line-height:1.5;margin:0;background:#EEE}html{min-height:100%}.title h1{font-size:7em;color:#3498DB;margin:-20px auto 0;line-height:100px;padding-bottom:20px}.center{max-width:70em;background:rgba(255,255,255,.6);padding:2em;margin:7% auto 0}.center.search{position:static;width:auto;background:0 0;margin:auto;padding-top:1.8em}@media screen and (min-width:1001px){.center:after{content:"";z-index:-1;background:url(../img/bg-body-index.jpg) no-repeat;background-size:cover;width:100%;height:100%;top:0;left:0;position:fixed}.center.search:after{content:none}}.autocompleter-choices{position:absolute;margin:0;padding:0;background:#FFF}.autocompleter-choices li{padding:.5em 1em}.autocompleter-choices li:hover{background:#3498DB;color:#FFF;cursor:pointer}.top_margin{position:absolute;bottom:-3.5em;width:100%;left:0}.top_margin a{margin-right:1em;color:#FFF;text-decoration:none}.top_margin a:focus,.top_margin a:hover{text-decoration:underline}@media screen and (max-width:1000px){.center{background:0 0}.top_margin a{color:#333}}.checkbox_container{margin-top:1.5em}.checkbox_container label{padding:.5em 1em;color:#333;cursor:pointer;font-size:.9em}.checkbox_container input[type=checkbox]:checked+label,.checkbox_container label:hover{background:#3498DB;color:#FFF}.checkbox_container input[type=checkbox]{position:absolute;top:-9999px}#categories .hidden{display:none;position:absolute;bottom:1em;left:0;text-align:center;width:100%;font-size:.9em;color:#333}#categories:hover .hidden,.right a{display:block}@media screen and (max-width:900px){#categories_container{letter-spacing:-5px}#categories_container>div{letter-spacing:normal;margin-top:1em}.checkbox_container{margin:0}.checkbox_container label{display:block;background:#CCC;padding:1em;border:1px solid #FFF}.top_margin{position:static}#categories .hidden{position:static;display:block}}@media screen and (max-width:900px) and (min-width:501px){#categories_container>div{width:31%;margin-left:2.333%}#categories_container>div:nth-child(3n+1){margin-left:0}}@media screen and (max-width:500px){#categories_container>div{width:48%;margin-left:2%;font-size:.9em}#categories_container>div:nth-child(2n+1){margin-left:0}.title h1{background:url(../img/searx-mobile.png) no-repeat;width:200px;height:39px}}#search_wrapper{position:relative}.q{padding:.5em 3em .5em 1em;width:100%;font-size:1.5em;border:0;color:#666}.cache_link,.result p{font-size:.9em}#search_submit{position:absolute;top:0;right:0;border:0;background:url(../img/search-icon.png) center center/65% auto no-repeat #3498DB;text-indent:-9999px;width:5em;height:100%;cursor:pointer}#sidebar,.right{position:fixed;width:15em;right:0;text-align:right}#search_submit:focus,#search_submit:hover{background-color:#0665A2}#sidebar{background:#3498DB;top:0;height:100%;padding:1.5em}.right{bottom:1.5em;z-index:1;padding:0 1.5em}.right a{color:#FFF;text-decoration:none}#sidebar form,#suggestions form,.row fieldset{display:inline-block}.right a:focus,.right a:hover{text-decoration:underline}#preferences{background:url(../img/preference-icon.png) right center/12% auto no-repeat;padding-right:1.8em}#search_url input{border:0;padding:.5em}#sidebar>div{margin-bottom:1em;color:#FFF}#sidebar input[type=submit]{background:#CCC;border:0;padding:.5em 1em;cursor:pointer;margin-top:.5em}#sidebar input[type=submit]:focus,#sidebar input[type=submit]:hover{color:#FFF;background-color:#0665A2}#results{padding:0 17em 0 2em}.result .engines{text-align:right}.result .content{margin:0;color:#666}.result .url{margin-top:0;color:#FF6530}.result .favicon{float:left;position:relative;top:.5em;margin-right:.5em}.definition_result{background:#CCC;padding:1em}.definition_result .result_title,.definition_result p{margin:0}.result_title{margin-bottom:0;font-weight:400}.result_title a{color:#3498DB;text-decoration:none}#answers,#suggestions span{color:#666}.result_title a:focus,.result_title a:hover{text-decoration:underline}.cache_link{color:#666}.search.center{padding-right:17em}#answers{border:2px solid #3498DB;padding:20px;text-align:center;max-width:70em;margin:0 auto 20px}#suggestions{margin-bottom:1em}#suggestions form{vertical-align:top;margin-bottom:.5em}#suggestions input[type=submit]{color:#333;padding:.5em 1em;border:0;background:#CCC;cursor:pointer}#suggestions input[type=submit]:focus,#suggestions input[type=submit]:hover{background:#3498DB;color:#FFF}#pagination{margin:1.5em 0 2em}#pagination form+form{float:right;margin-top:-2em}input[type=submit]{display:inline-block;background:#3498DB;color:#FFF;border:0;padding:.6em 1em;cursor:pointer}input[type=submit]:focus,input[type=submit]:hover{background:#0665A2}.row{max-width:60em;margin:auto}.row a{color:#3498DB}.row form{letter-spacing:-5px}.row form>*{letter-spacing:normal}.row p{margin:0}.row fieldset{width:48%;vertical-align:top}.row fieldset:last-of-type{display:block;width:auto;background:0 0;padding:0}fieldset,table tr:nth-child(odd){background:#CCC}.row fieldset:nth-child(odd){margin-right:2%}.row fieldset:nth-child(2){min-height:10.5em}@media screen and (max-width:900px){.row{margin:0 1em}.row fieldset{width:49%}.row fieldset,.row fieldset:nth-child(odd){margin-right:0}.row fieldset:first-child{width:100%;margin-right:0}.row fieldset:nth-child(even){margin-right:2%}}@media screen and (max-width:800px){.row fieldset,select{width:100%}table{font-size:.8em}#sidebar,.right{display:none}#results{padding:0 2em}.search.center{padding-right:2em}}@media screen and (max-width:400px){.row #categories_container>div{width:100%;margin-left:0}}fieldset{border:0;margin:1em 0;padding:1.5em}table{width:100%;text-align:left;border:1px solid #CCC;border-collapse:collapse}table th{background:#999;color:#FFF}table td,table th{padding:.5em 1em;border:1px solid #FFF}.engine_checkbox label{padding:.5em;background:#3498DB;color:#FFF;cursor:pointer}.engine_checkbox .deny{background:#3498DB}.engine_checkbox .allow{display:none;background:#666}.engine_checkbox input{display:none}.engine_checkbox input:checked+.allow{display:inline}.engine_checkbox input:checked+.allow+.deny{display:none}.row input[type=submit]{font-size:1em;margin:1em 0 2em}.row .right{position:static;display:inline-block}.row .right a{color:#333;width:auto;text-align:left;padding:0}.small_font{font-size:.8em}table th{padding:1em}legend{background:#EEE;padding:0 1em;position:relative}select{border:1px solid #DDD;padding:.5em .8em;font-size:1em}.highlight .hll{background-color:#ffc}.highlight{font-weight:700;background:#f8f8f8}.highlight .c{color:#408080}.highlight .err{border:1px solid red}.highlight .k{color:green;font-weight:700}.highlight .o{color:#666}.highlight .cm{color:#408080}.highlight .cp{color:#BC7A00}.highlight .c1,.highlight .cs{color:#408080;font-style:italic}.highlight .gd{color:#A00000}.highlight .gr{color:red}.highlight .gh{color:navy;font-weight:700}.highlight .gi{color:#00A000}.highlight .go{color:#888}.highlight .gp{color:navy;font-weight:700}.highlight .gs{font-weight:700}.highlight .gu{color:purple;font-weight:700}.highlight .gt{color:#04D}.highlight .kc,.highlight .kd,.highlight .kn{color:green;font-weight:700}.highlight .kp{color:green}.highlight .kr{color:green;font-weight:700}.highlight .kt{color:#B00040}.highlight .m{color:#666}.highlight .s{color:#BA2121}.highlight .na{color:#7D9029}.highlight .nb{color:green}.highlight .nc{color:#00F;font-weight:700}.highlight .no{color:#800}.highlight .nd{color:#A2F}.highlight .ni{color:#999;font-weight:700}.highlight .ne{color:#D2413A;font-weight:700}.highlight .nf{color:#00F}.highlight .nl{color:#A0A000}.highlight .nn{color:#00F;font-weight:700}.highlight .nt{color:green;font-weight:700}.highlight .nv{color:#19177C}.highlight .ow{color:#A2F;font-weight:700}.highlight .w{color:#bbb}.highlight .mf,.highlight .mh,.highlight .mi,.highlight .mo{color:#666}.highlight .s2,.highlight .sb,.highlight .sc{color:#BA2121}.highlight .sd{color:#BA2121}.highlight .se{color:#B62;font-weight:700}.highlight .sh{color:#BA2121}.highlight .si{color:#B68;font-weight:700}.highlight .sx{color:green}.highlight .sr{color:#B68}.highlight .s1{color:#BA2121}.highlight .ss{color:#19177C}.highlight .bp{color:green}.highlight .vc,.highlight .vg,.highlight .vi{color:#19177C}.highlight .il{color:#666}.highlight pre{overflow:auto}.highlight .lineno{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:default}.highlight .lineno::selection{background:0 0}.highlight .lineno::-moz-selection{background:0 0}

searx/static/themes/courgette/less/style.less+4

@@ -325,6 +325,10 @@ a {

325325 font-size: 0.9em;

326326}

327327

328+.result .engines {

329+ text-align: right;

330+}

331+

328332.result .content {

329333 margin: 0;

330334 color: #666;

searx/static/themes/legacy/css/style.css+1−1

@@ -1 +1 @@

1−.highlight .c,.highlight .cm,.highlight .ge,.highlight .sd{font-style:italic}#categories,.highlight .lineno{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none}#container,.search,body,html{padding:0;margin:0}div.title h1,input[type=checkbox]{visibility:hidden}#categories,.checkbox_container label,.engine_checkbox label,.highlight .lineno{-webkit-touch-callout:none;-khtml-user-select:none}#answers input[type=submit],#infoboxes input[type=submit],#sidebar input[type=submit],#suggestions input[type=submit],.result_title a:hover,.torrent_result a:hover{text-decoration:underline}#infoboxes,.result .content,.result .url,.result h3{word-wrap:break-word}#apis,#infoboxes .infobox br,#pagination,#pagination br,.result,.result .content br.last{clear:both}.highlight .hll{background-color:#ffc}.highlight{background:#f8f8f8}.highlight .c{color:#408080}.highlight .err{border:1px solid red}.highlight .k{color:green;font-weight:700}.highlight .o{color:#666}.highlight .cm{color:#408080}.highlight .cp{color:#BC7A00}.highlight .c1,.highlight .cs{color:#408080;font-style:italic}.highlight .gd{color:#A00000}.highlight .gr{color:red}.highlight .gh{color:navy;font-weight:700}.highlight .gi{color:#00A000}.highlight .go{color:#888}.highlight .gp{color:navy;font-weight:700}.highlight .gs{font-weight:700}.highlight .gu{color:purple;font-weight:700}.highlight .gt{color:#04D}.highlight .kc,.highlight .kd,.highlight .kn{color:green;font-weight:700}.highlight .kp{color:green}.highlight .kr{color:green;font-weight:700}.highlight .kt{color:#B00040}.highlight .m{color:#666}.highlight .s{color:#BA2121}.highlight .na{color:#7D9029}.highlight .nb{color:green}.highlight .nc{color:#00F;font-weight:700}.highlight .no{color:#800}.highlight .nd{color:#A2F}.highlight .ni{color:#999;font-weight:700}.highlight .ne{color:#D2413A;font-weight:700}.highlight .nf{color:#00F}.highlight .nl{color:#A0A000}.highlight .nn{color:#00F;font-weight:700}.highlight .nt{color:green;font-weight:700}.highlight .nv{color:#19177C}.highlight .ow{color:#A2F;font-weight:700}.highlight .w{color:#bbb}.highlight .mf,.highlight .mh,.highlight .mi,.highlight .mo{color:#666}.highlight .s2,.highlight .sb,.highlight .sc{color:#BA2121}.highlight .sd{color:#BA2121}.highlight .se{color:#B62;font-weight:700}.highlight .sh{color:#BA2121}.highlight .si{color:#B68;font-weight:700}.highlight .sx{color:green}.highlight .sr{color:#B68}.highlight .s1{color:#BA2121}.highlight .ss{color:#19177C}.highlight .bp{color:green}.highlight .vc,.highlight .vg,.highlight .vi{color:#19177C}.highlight .il{color:#666}.highlight pre{overflow:auto}.highlight .lineno{user-select:none;cursor:default}.highlight .lineno::selection{background:0 0}.highlight .lineno::-moz-selection{background:0 0}html{font-family:sans-serif;font-size:.9em;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-moz-text-size-adjust:100%;text-size-adjust:100%;color:#444}#container{width:100%;position:absolute;top:0}.search .checkbox_container label{font-size:.9em;border-bottom:2px solid #E8E7E6}.search .checkbox_container label:hover{border-bottom:2px solid #3498DB}.search .checkbox_container input[type=checkbox]:checked+label{border-bottom:2px solid #2980B9}#search_wrapper{position:relative;width:50em;padding:10px}.center #search_wrapper{margin-left:auto;margin-right:auto}.q,ul.autocompleter-choices{margin:0;border:1px solid #3498DB}.q{background:#FFF;color:#222;font-size:16px;height:28px;outline:0;padding:2px 2px 2px 8px;padding-right:0!important;width:100%;z-index:2}#search_submit{position:absolute;top:13px;right:1px;padding:0;border:0;background:url(../img/search-icon.png) no-repeat;background-size:24px 24px;opacity:.8;width:24px;height:30px;font-size:0}@media screen and (max-width:50em){#search_wrapper{width:90%;clear:both;overflow:hidden}}ul.autocompleter-choices{position:absolute;padding:0;list-style:none;border-left-color:#3498DB;border-right-color:#3498DB;border-bottom-color:#3498DB;text-align:left;font-family:Verdana,Geneva,Arial,Helvetica,sans-serif;z-index:50;background-color:#FFF;color:#444}ul.autocompleter-choices li{position:relative;margin:-2px 0 0;padding:.2em 1.5em .2em 1em;display:block;float:none!important;cursor:pointer;font-weight:400;white-space:nowrap;font-size:1em;line-height:1.5em}ul.autocompleter-choices li.autocompleter-selected{background-color:#444;color:#FFF}ul.autocompleter-choices li.autocompleter-selected span.autocompleter-queried{color:#9FCFFF}ul.autocompleter-choices span.autocompleter-queried{display:inline;float:none;font-weight:700;margin:0;padding:0}.row{max-width:800px;margin:20px auto;text-align:justify}.row h1{font-size:3em;margin-top:50px}.row p{padding:0 10px;max-width:700px}.row h3,.row ul{margin:4px 8px}.hmarg{margin:0 20px;border:1px solid #3498DB;padding:4px 10px}a:active.hmarg,a:hover.hmarg,a:link.hmarg,a:visited.hmarg{color:#3498DB}.top_margin{margin-top:60px}.center{text-align:center}h1{font-size:5em}div.title{background:url(../img/searx.png) center no-repeat;width:100%;min-height:80px}input[type=submit]{padding:2px 6px;margin:2px 4px;display:inline-block;background:#3498DB;color:#FFF;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0;cursor:pointer}fieldset{margin:8px;border:1px solid #3498DB}#categories{margin:0 10px;user-select:none}.checkbox_container{display:inline-block;position:relative;margin:0 3px;padding:0}.checkbox_container input{display:none}.checkbox_container label,.engine_checkbox label{cursor:pointer;padding:4px 10px;margin:0;display:block;text-transform:capitalize;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.checkbox_container input[type=checkbox]:checked+label{background:#3498DB;color:#FFF}.engine_checkbox{padding:4px}label.allow{background:#E74C3C;padding:4px 8px;color:#FFF;display:none}label.deny{background:#2ECC71;padding:4px 8px;color:#444;display:inline}.engine_checkbox input[type=checkbox]:checked+label:nth-child(2)+label{display:none}.engine_checkbox input[type=checkbox]:checked+label.allow{display:inline}a{text-decoration:none;color:#1a11be}a:visited{color:#8E44AD}.result{margin:19px 0 18px;padding:0}.result_title{margin-bottom:0}.result_title a{color:#2980B9;font-weight:400;font-size:1.1em}.result_title a:visited{color:#8E44AD}.cache_link{font-size:10px!important}.result h3{font-size:1em;margin:5px 0 1px;padding:0}.result .content,.result .url,.small_font{font-size:.8em}.result .content{margin:0;padding:0;max-width:54em;line-height:1.24}.result .content img{float:left;margin-right:5px;max-width:200px;max-height:100px}.result .url{margin:0 0 3px;padding:0;max-width:54em;color:#C0392B}.result .published_date{font-size:.8em;color:#888;Margin:5px 20px}.result .thumbnail{width:400px}.engines{color:#888}.small p{margin:2px 0}.right{float:right}.invisible{display:none}.left{float:left}.highlight{color:#094089}.content .highlight{color:#000}.image_result{display:inline-block;margin:10px;position:relative;max-height:160px}.image_result img{border:0;max-height:160px}.image_result p{margin:0;padding:0}.image_result p span a{display:none;color:#FFF}.image_result p:hover span a{display:block;position:absolute;bottom:0;right:0;padding:4px;background-color:rgba(0,0,0,.6);font-size:.7em}#categories_container,.percentage{position:relative}.torrent_result{border-left:10px solid #d3d3d3;padding-left:3px}.torrent_result p{margin:3px;font-size:.8em}.torrent_result a{color:#2980B9}.torrent_result a:visited{color:#8E44AD}.definition_result{border-left:10px solid gray;padding-left:3px}#infoboxes,#sidebar{margin:0 2px 5px 5px;padding:0 2px 2px}.percentage{width:300px}.percentage div{background:#444}table{width:100%}td{padding:0 4px}tr:hover{background:#DDD}#results{margin:auto auto 20px;padding:0;width:50em}#sidebar{position:fixed;bottom:10px;left:10px;width:14em}#answers input,#infoboxes input,#sidebar input,#suggestions input{padding:0;margin:3px;font-size:.8em;display:inline-block;background:0 0;color:#444;cursor:pointer}#suggestions form{display:inline}#answers,#suggestions{margin-top:20px;max-width:45em}#suggestions-title{color:#888}#answers{border:2px solid #2980B9;padding:20px}#answers form,#infoboxes form{min-width:210px}#infoboxes{position:absolute;top:100px;right:20px;max-width:21em}#infoboxes .infobox{margin:10px 0;border:1px solid #ddd;padding:5px;font-size:.8em}#infoboxes .infobox img{max-width:90%;max-heigt:12em;display:block;margin:5px;padding:5px}#infoboxes .infobox h2{margin:0}#apis,#search_url{margin-top:8px}#infoboxes .infobox table{table-layout:fixed}#infoboxes .infobox table td{vertical-align:top}#infoboxes .infobox input{font-size:1em}#search_url input{border:1px solid #888;padding:4px;color:#444;width:14em;display:block;margin:4px;font-size:.8em}#preferences{top:10px;padding:0;border:0;background:url(../img/preference-icon.png) no-repeat;background-size:28px 28px;opacity:.8;width:28px;height:30px;display:block}#preferences *{display:none}@media screen and (max-width:50em){#results{margin:auto;padding:0;width:90%}.github{display:none}.checkbox_container{display:block;width:90%}.checkbox_container label{border-bottom:0}.preferences_container{display:none;postion:fixed!important;top:100px;right:0}}@media screen and (max-width:75em){div.title h1{font-size:1em}html.touch #categories{width:95%;height:30px;text-align:left;overflow-x:scroll;overflow-y:hidden;-webkit-overflow-scrolling:touch}html.touch #categories #categories_container{width:1000px;width:-moz-max-content;width:-webkit-max-content;width:max-content}html.touch #categories #categories_container .checkbox_container{display:inline-block;width:auto}#answers,#suggestions{margin-top:5px}#infoboxes{position:inherit;max-width:inherit}#infoboxes .infobox{clear:both}#infoboxes .infobox img{float:left;max-width:10em}#categories{font-size:90%;clear:both}#categories .checkbox_container{margin:auto}#sidebar{position:static;max-width:50em;margin:0 0 2px;padding:0;float:none;border:none;width:auto}#sidebar input{border:0}#apis,#search_url{display:none}.result{border-top:1px solid #E8E7E6;margin:8px 0}.image_result,.image_result img,.result .thumbnail{max-width:98%}}.favicon{float:left;margin-right:4px;margin-top:2px}.preferences_back{background:#3498DB;border:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;cursor:pointer;display:inline-block;margin:2px 4px;padding:4px 6px}.preferences_back a{color:#FFF}.hidden{opacity:0;overflow:hidden;font-size:.8em;position:absolute;bottom:-20px;width:100%;text-position:center;background:#fff;transition:opacity 1s ease}#categories_container:hover .hidden{transition:opacity 1s ease;opacity:.8}

1+.highlight .c,.highlight .cm,.highlight .ge,.highlight .sd{font-style:italic}#categories,.highlight .lineno{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none}#container,.search,body,html{padding:0;margin:0}div.title h1,input[type=checkbox]{visibility:hidden}#categories,.checkbox_container label,.engine_checkbox label,.highlight .lineno{-webkit-touch-callout:none;-khtml-user-select:none}#answers input[type=submit],#infoboxes input[type=submit],#sidebar input[type=submit],#suggestions input[type=submit],.result_title a:hover,.torrent_result a:hover{text-decoration:underline}#infoboxes,.result .content,.result .url,.result h3{word-wrap:break-word}#apis,#infoboxes .infobox br,#pagination,#pagination br,.result,.result .content br.last{clear:both}.highlight .hll{background-color:#ffc}.highlight{background:#f8f8f8}.highlight .c{color:#408080}.highlight .err{border:1px solid red}.highlight .k{color:green;font-weight:700}.highlight .o{color:#666}.highlight .cm{color:#408080}.highlight .cp{color:#BC7A00}.highlight .c1,.highlight .cs{color:#408080;font-style:italic}.highlight .gd{color:#A00000}.highlight .gr{color:red}.highlight .gh{color:navy;font-weight:700}.highlight .gi{color:#00A000}.highlight .go{color:#888}.highlight .gp{color:navy;font-weight:700}.highlight .gs{font-weight:700}.highlight .gu{color:purple;font-weight:700}.highlight .gt{color:#04D}.highlight .kc,.highlight .kd,.highlight .kn{color:green;font-weight:700}.highlight .kp{color:green}.highlight .kr{color:green;font-weight:700}.highlight .kt{color:#B00040}.highlight .m{color:#666}.highlight .s{color:#BA2121}.highlight .na{color:#7D9029}.highlight .nb{color:green}.highlight .nc{color:#00F;font-weight:700}.highlight .no{color:#800}.highlight .nd{color:#A2F}.highlight .ni{color:#999;font-weight:700}.highlight .ne{color:#D2413A;font-weight:700}.highlight .nf{color:#00F}.highlight .nl{color:#A0A000}.highlight .nn{color:#00F;font-weight:700}.highlight .nt{color:green;font-weight:700}.highlight .nv{color:#19177C}.highlight .ow{color:#A2F;font-weight:700}.highlight .w{color:#bbb}.highlight .mf,.highlight .mh,.highlight .mi,.highlight .mo{color:#666}.highlight .s2,.highlight .sb,.highlight .sc{color:#BA2121}.highlight .sd{color:#BA2121}.highlight .se{color:#B62;font-weight:700}.highlight .sh{color:#BA2121}.highlight .si{color:#B68;font-weight:700}.highlight .sx{color:green}.highlight .sr{color:#B68}.highlight .s1{color:#BA2121}.highlight .ss{color:#19177C}.highlight .bp{color:green}.highlight .vc,.highlight .vg,.highlight .vi{color:#19177C}.highlight .il{color:#666}.highlight pre{overflow:auto}.highlight .lineno{user-select:none;cursor:default}.highlight .lineno::selection{background:0 0}.highlight .lineno::-moz-selection{background:0 0}html{font-family:sans-serif;font-size:.9em;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-moz-text-size-adjust:100%;text-size-adjust:100%;color:#444}#container{width:100%;position:absolute;top:0}.search .checkbox_container label{font-size:.9em;border-bottom:2px solid #E8E7E6}.search .checkbox_container label:hover{border-bottom:2px solid #3498DB}.search .checkbox_container input[type=checkbox]:checked+label{border-bottom:2px solid #2980B9}#search_wrapper{position:relative;width:50em;padding:10px}.center #search_wrapper{margin-left:auto;margin-right:auto}.q,ul.autocompleter-choices{margin:0;border:1px solid #3498DB}.q{background:#FFF;color:#222;font-size:16px;height:28px;outline:0;padding:2px 2px 2px 8px;padding-right:0!important;width:100%;z-index:2}#search_submit{position:absolute;top:13px;right:1px;padding:0;border:0;background:url(../img/search-icon.png) no-repeat;background-size:24px 24px;opacity:.8;width:24px;height:30px;font-size:0}@media screen and (max-width:50em){#search_wrapper{width:90%;clear:both;overflow:hidden}}ul.autocompleter-choices{position:absolute;padding:0;list-style:none;border-left-color:#3498DB;border-right-color:#3498DB;border-bottom-color:#3498DB;text-align:left;font-family:Verdana,Geneva,Arial,Helvetica,sans-serif;z-index:50;background-color:#FFF;color:#444}ul.autocompleter-choices li{position:relative;margin:-2px 0 0;padding:.2em 1.5em .2em 1em;display:block;float:none!important;cursor:pointer;font-weight:400;white-space:nowrap;font-size:1em;line-height:1.5em}ul.autocompleter-choices li.autocompleter-selected{background-color:#444;color:#FFF}ul.autocompleter-choices li.autocompleter-selected span.autocompleter-queried{color:#9FCFFF}ul.autocompleter-choices span.autocompleter-queried{display:inline;float:none;font-weight:700;margin:0;padding:0}.row{max-width:800px;margin:20px auto;text-align:justify}.row h1{font-size:3em;margin-top:50px}.row p{padding:0 10px;max-width:700px}.row h3,.row ul{margin:4px 8px}.hmarg{margin:0 20px;border:1px solid #3498DB;padding:4px 10px}a:active.hmarg,a:hover.hmarg,a:link.hmarg,a:visited.hmarg{color:#3498DB}.top_margin{margin-top:60px}.center{text-align:center}h1{font-size:5em}div.title{background:url(../img/searx.png) center no-repeat;width:100%;min-height:80px}input[type=submit]{padding:2px 6px;margin:2px 4px;display:inline-block;background:#3498DB;color:#FFF;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0;cursor:pointer}fieldset{margin:8px;border:1px solid #3498DB}#categories{margin:0 10px;user-select:none}.checkbox_container{display:inline-block;position:relative;margin:0 3px;padding:0}.checkbox_container input{display:none}.checkbox_container label,.engine_checkbox label{cursor:pointer;padding:4px 10px;margin:0;display:block;text-transform:capitalize;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.checkbox_container input[type=checkbox]:checked+label{background:#3498DB;color:#FFF}.engine_checkbox{padding:4px}label.allow{background:#E74C3C;padding:4px 8px;color:#FFF;display:none}label.deny{background:#2ECC71;padding:4px 8px;color:#444;display:inline}.engine_checkbox input[type=checkbox]:checked+label:nth-child(2)+label{display:none}.engine_checkbox input[type=checkbox]:checked+label.allow{display:inline}a{text-decoration:none;color:#1a11be}a:visited{color:#8E44AD}.result{margin:19px 0 18px;padding:0}.result_title{margin-bottom:0}.result_title a{color:#2980B9;font-weight:400;font-size:1.1em}.result_title a:visited{color:#8E44AD}.cache_link{font-size:10px!important}.result h3{font-size:1em;margin:5px 0 1px;padding:0}.result .content,.result .url,.small_font{font-size:.8em}.result .content{margin:0;padding:0;max-width:54em;line-height:1.24}.result .content img{float:left;margin-right:5px;max-width:200px;max-height:100px}.result .url{margin:0 0 3px;padding:0;max-width:54em;color:#C0392B}.result .published_date{font-size:.8em;color:#888;Margin:5px 20px}.result .thumbnail{width:400px}.engines{color:#888}.small p{margin:2px 0}.right{float:right}.invisible{display:none}.left{float:left}.highlight{color:#094089}.content .highlight{color:#000}.image_result{display:inline-block;margin:10px;position:relative;max-height:160px}.image_result img{border:0;max-height:160px}.image_result p{margin:0;padding:0}.image_result p span a{display:none;color:#FFF}.image_result p:hover span a{display:block;position:absolute;bottom:0;right:0;padding:4px;background-color:rgba(0,0,0,.6);font-size:.7em}#categories_container,.percentage{position:relative}.torrent_result{border-left:10px solid #d3d3d3;padding-left:3px}.torrent_result p{margin:3px;font-size:.8em}.torrent_result a{color:#2980B9}.torrent_result a:visited{color:#8E44AD}.definition_result{border-left:10px solid gray;padding-left:3px}.percentage{width:300px}.percentage div{background:#444}table{width:100%}.result-table{margin-bottom:10px}#infoboxes,#sidebar{margin:0 2px 5px 5px;padding:0 2px 2px}td{padding:0 4px}tr:hover{background:#DDD}#results{margin:auto auto 20px;padding:0;width:50em}#sidebar{position:fixed;bottom:10px;left:10px;width:14em}#answers input,#infoboxes input,#sidebar input,#suggestions input{padding:0;margin:3px;font-size:.8em;display:inline-block;background:0 0;color:#444;cursor:pointer}#suggestions form{display:inline}#answers,#suggestions{margin-top:20px;max-width:45em}#suggestions-title{color:#888}#answers{border:2px solid #2980B9;padding:20px}#answers form,#infoboxes form{min-width:210px}#infoboxes{position:absolute;top:100px;right:20px;max-width:21em}#infoboxes .infobox{margin:10px 0;border:1px solid #ddd;padding:5px;font-size:.8em}#infoboxes .infobox img{max-width:90%;max-heigt:12em;display:block;margin:5px;padding:5px}#infoboxes .infobox h2{margin:0}#apis,#search_url{margin-top:8px}#infoboxes .infobox table{table-layout:fixed}#infoboxes .infobox table td{vertical-align:top}#infoboxes .infobox input{font-size:1em}#search_url input{border:1px solid #888;padding:4px;color:#444;width:14em;display:block;margin:4px;font-size:.8em}#preferences{top:10px;padding:0;border:0;background:url(../img/preference-icon.png) no-repeat;background-size:28px 28px;opacity:.8;width:28px;height:30px;display:block}#preferences *{display:none}@media screen and (max-width:50em){#results{margin:auto;padding:0;width:90%}.github{display:none}.checkbox_container{display:block;width:90%}.checkbox_container label{border-bottom:0}.preferences_container{display:none;postion:fixed!important;top:100px;right:0}}@media screen and (max-width:75em){div.title h1{font-size:1em}html.touch #categories{width:95%;height:30px;text-align:left;overflow-x:scroll;overflow-y:hidden;-webkit-overflow-scrolling:touch}html.touch #categories #categories_container{width:1000px;width:-moz-max-content;width:-webkit-max-content;width:max-content}html.touch #categories #categories_container .checkbox_container{display:inline-block;width:auto}#answers,#suggestions{margin-top:5px}#infoboxes{position:inherit;max-width:inherit}#infoboxes .infobox{clear:both}#infoboxes .infobox img{float:left;max-width:10em}#categories{font-size:90%;clear:both}#categories .checkbox_container{margin:auto}#sidebar{position:static;max-width:50em;margin:0 0 2px;padding:0;float:none;border:none;width:auto}#sidebar input{border:0}#apis,#search_url{display:none}.result{border-top:1px solid #E8E7E6;margin:8px 0}.image_result,.image_result img,.result .thumbnail{max-width:98%}}.favicon{float:left;margin-right:4px;margin-top:2px}.preferences_back{background:#3498DB;border:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;cursor:pointer;display:inline-block;margin:2px 4px;padding:4px 6px}.preferences_back a{color:#FFF}.hidden{opacity:0;overflow:hidden;font-size:.8em;position:absolute;bottom:-20px;width:100%;text-position:center;background:#fff;transition:opacity 1s ease}#categories_container:hover .hidden{transition:opacity 1s ease;opacity:.8}

searx/static/themes/legacy/less/style.less+4

@@ -376,6 +376,10 @@ table {

376376 width: 100%;

377377}

378378

379+.result-table {

380+ margin-bottom: 10px;

381+}

382+

379383td {

380384 padding: 0 4px;

381385}

searx/templates/courgette/result_templates/key-value.htmlnew file+13

@@ -0,0 +1,13 @@

1+<div class="result">

2+<table>

3+ {% for key, value in result.items() %}

4+ {% if key in ['engine', 'engines', 'template', 'score', 'category', 'positions'] %}

5+ {% continue %}

6+ {% endif %}

7+ <tr>

8+ <td><b>{{ key|upper }}</b>: {{ value|safe }}</td>

9+ </tr>

10+ {% endfor %}

11+</table>

12+<p class="engines">{{ result.engines|join(', ') }}</p>

13+</div>

searx/templates/legacy/result_templates/key-value.htmlnew file+13

@@ -0,0 +1,13 @@

1+<table class="result-table">

2+ {% for key, value in result.items() %}

3+ {% if key in ['engine', 'engines', 'template', 'score', 'category', 'positions'] %}

4+ {% continue %}

5+ {% endif %}

6+ <tr>

7+ <td><b>{{ key|upper }}</b>: {{ value|safe }}</td>

8+ </tr>

9+ {% endfor %}

10+ <tr>

11+ <td><b>ENGINES</b>: {{ result.engines|join(', ') }}</td>

12+ </tr>

13+</table>

searx/templates/oscar/macros.html+9−1

@@ -14,7 +14,7 @@

1414

1515

1616{% macro result_header(result, favicons) -%}

17−<h4 class="result_header">{% if result.engine~".png" in favicons %}{{ draw_favicon(result.engine) }} {% endif %}{{ result_link(result.url, result.title|safe) }}</h4>

17+<h4 class="result_header">{% if result.engine~".png" in favicons %}{{ draw_favicon(result.engine) }} {% endif %}{% if result.url %}{{ result_link(result.url, result.title|safe) }}{% else %}{{ result.title|safe}}{% endif %}</h4>

1818{%- endmacro %}

1919

2020

@@ -31,12 +31,16 @@

3131 {% for engine in result.engines %}

3232 <span class="label label-default">{{ engine }}</span>

3333 {% endfor %}

34+ {% if result.url %}

3435 <small>{{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info") }}</small>

36+ {% endif %}

3537 {% if proxify %}

3638 <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }}</small>

3739 {% endif %}

3840</div>

41+{% if result.pretty_url %}

3942<div class="external-link">{{ result.pretty_url }}</div>

43+{% endif %}

4044{%- endmacro %}

4145

4246

@@ -45,11 +49,15 @@

4549 {% for engine in result.engines %}

4650 <span class="label label-default">{{ engine }}</span>

4751 {% endfor %}

52+ {% if result.url %}

4853 <small>{{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info") }}</small>

54+ {% endif %}

4955 {% if proxify %}

5056 <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }}</small>

5157 {% endif %}

58+ {% if result.pretty_url %}

5259 <div class="external-link">{{ result.pretty_url }}</div>

60+ {% endif %}

5361{%- endmacro %}

5462

5563{% macro preferences_item_header(info, label, rtl) -%}

searx/templates/oscar/result_templates/key-value.htmlnew file+19

@@ -0,0 +1,19 @@

1+{% from 'oscar/macros.html' import result_footer, result_footer_rtl with context %}

2+<div class="panel panel-default">

3+<table class="table table-responsive table-bordered table-condensed">

4+ {% for key, value in result.items() %}

5+ {% if key in ['engine', 'engines', 'template', 'score', 'category', 'positions'] %}

6+ {% continue %}

7+ {% endif %}

8+ <tr>

9+ <td><b>{{ key|upper }}</b>: {{ value }}</td>

10+ </tr>

11+ {% endfor %}

12+</table>

13+

14+{% if rtl %}

15+{{ result_footer_rtl(result) }}

16+{% else %}

17+{{ result_footer(result) }}

18+{% endif %}

19+</div>

searx/templates/simple/result_templates/key-value.htmlnew file+11

@@ -0,0 +1,11 @@

1+<table>

2+ {% for key, value in result.items() %}

3+ {% if key in ['engine', 'engines', 'template', 'score', 'category', 'positions'] %}

4+ {% continue %}

5+ {% endif %}

6+ <tr>

7+ <td><b>{{ key|upper }}</b>: {{ value }}</td>

8+ </tr>

9+ {% endfor %}

10+</table>

11+<div class="engines">{% for engine in result.engines %}<span>{{ engine }}</span>{% endfor %}</div>{{- '' -}}

searx/utils.py+15

@@ -435,3 +435,18 @@ def ecma_unescape(s):

435435 # "%20" becomes " ", "%F3" becomes "ó"

436436 s = ecma_unescape2_re.sub(lambda e: unichr(int(e.group(1), 16)), s)

437437 return s

438+

439+

440+def get_engine_from_settings(name):

441+ """Return engine configuration from settings.yml of a given engine name"""

442+

443+ if 'engines' not in settings:

444+ return {}

445+

446+ for engine in settings['engines']:

447+ if 'name' not in engine:

448+ continue

449+ if name == engine['name']:

450+ return engine

451+

452+ return {}

searx/webapp.py+5−2

@@ -124,6 +124,7 @@ app = Flask(

124124

125125app.jinja_env.trim_blocks = True

126126app.jinja_env.lstrip_blocks = True

127+app.jinja_env.add_extension('jinja2.ext.loopcontrols')

127128app.secret_key = settings['server']['secret_key']

128129

129130if not searx_debug \

@@ -538,14 +539,16 @@ def index():

538539 if output_format == 'html':

539540 if 'content' in result and result['content']:

540541 result['content'] = highlight_content(escape(result['content'][:1024]), search_query.query)

541− result['title'] = highlight_content(escape(result['title'] or u''), search_query.query)

542+ if 'title' in result and result['title']:

543+ result['title'] = highlight_content(escape(result['title'] or u''), search_query.query)

542544 else:

543545 if result.get('content'):

544546 result['content'] = html_to_text(result['content']).strip()

545547 # removing html content and whitespace duplications

546548 result['title'] = ' '.join(html_to_text(result['title']).strip().split())

547549

548− result['pretty_url'] = prettify_url(result['url'])

550+ if 'url' in result:

551+ result['pretty_url'] = prettify_url(result['url'])

549552

550553 # TODO, check if timezone is calculated right

551554 if 'publishedDate' in result: