kamp/searxng
1
0
Fork 0
mirror of https://github.com/searxng/searxng.git synced 2024-11-20 03:10:10 +01:00
Code

Merge branch 'master' into feature/accessibility

Browse Source
This commit is contained in:
Mathieu Brunot 2019-10-29 23:53:08 +01:00 committed by GitHub
commit e9d90d06a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
searx/plugins/tracker_url_remover.py
View File

@ -39,16 +39,14 @@ def on_result(request, search, result):
return True return True
parsed_query = parse_qsl(query) parsed_query = parse_qsl(query)
changed = False changes = 0
for i, (param_name, _) in enumerate(list(parsed_query)): for i, (param_name, _) in enumerate(list(parsed_query)):
for reg in regexes: for reg in regexes:
if reg.match(param_name): if reg.match(param_name):
parsed_query.pop(i) parsed_query.pop(i - changes)
changed = True changes += 1
break
if changed:
result['parsed_url'] = result['parsed_url']._replace(query=urlencode(parsed_query)) result['parsed_url'] = result['parsed_url']._replace(query=urlencode(parsed_query))
result['url'] = urlunparse(result['parsed_url']) result['url'] = urlunparse(result['parsed_url'])
break
return True return True

4
searx/templates/oscar/results.html
View File

@ -22,8 +22,8 @@
<span class="result_header text-muted form-inline pull-left suggestion_item">{{ _('Try searching for:') }}</span> <span class="result_header text-muted form-inline pull-left suggestion_item">{{ _('Try searching for:') }}</span>
{% for correction in corrections %} {% for correction in corrections %}
<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation" class="form-inline pull-left suggestion_item"> <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation" class="form-inline pull-left suggestion_item">
<input type="hidden" name="q" value="{{ query_prefix + correction }}"> <input type="hidden" name="q" value="{{ correction.url }}">
<button type="submit" class="btn btn-default btn-xs">{{ correction }}</button> <button type="submit" class="btn btn-default btn-xs">{{ correction.title }}</button>
</form> </form>
{% endfor %} {% endfor %}
</div> </div>

4
searx/templates/simple/results.html
View File

@ -95,13 +95,13 @@
{% for correction in corrections %} {% for correction in corrections %}
<div class="left"> <div class="left">
<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation"> <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation">
<input type="hidden" name="q" value="{{ correction }}"> <input type="hidden" name="q" value="{{ correction.url }}">
<input type="hidden" name="time_range" value="{{ time_range }}"> <input type="hidden" name="time_range" value="{{ time_range }}">
<input type="hidden" name="language" value="{{ current_language }}"> <input type="hidden" name="language" value="{{ current_language }}">
<input type="hidden" name="safesearch" value="{{ safesearch }}"> <input type="hidden" name="safesearch" value="{{ safesearch }}">
<input type="hidden" name="theme" value="{{ theme }}"> <input type="hidden" name="theme" value="{{ theme }}">
{% if timeout_limit %}<input type="hidden" name="timeout_limit" value="{{ timeout_limit }}" >{% endif %} {% if timeout_limit %}<input type="hidden" name="timeout_limit" value="{{ timeout_limit }}" >{% endif %}
<input type="submit" value="{{ correction }}"> <input type="submit" value="{{ correction.title }}">
</form> </form>
</div> </div>
{% endfor %} {% endfor %}

8
searx/webapp.py
View File

@ -610,6 +610,12 @@ def index():
'title': suggestion 'title': suggestion
}, },
result_container.suggestions) result_container.suggestions)
correction_urls = list(map(lambda correction: {
'url': raw_text_query.changeSearchQuery(correction).getFullQuery(),
'title': correction
},
result_container.corrections))
# #
return render( return render(
'results.html', 'results.html',
@ -622,7 +628,7 @@ def index():
advanced_search=advanced_search, advanced_search=advanced_search,
suggestions=suggestion_urls, suggestions=suggestion_urls,
answers=result_container.answers, answers=result_container.answers,
corrections=result_container.corrections, corrections=correction_urls,
infoboxes=result_container.infoboxes, infoboxes=result_container.infoboxes,
paging=result_container.paging, paging=result_container.paging,
unresponsive_engines=result_container.unresponsive_engines, unresponsive_engines=result_container.unresponsive_engines,