summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Tauber <asciimoo@gmail.com>2015-01-20 13:41:07 +0100
committerAdam Tauber <asciimoo@gmail.com>2015-01-20 13:41:07 +0100
commitf6b42204148ad3f49165174ef5124090d30f7350 (patch)
tree46f2ab93536d5054daae05aa81fa1246146bb3d3
parent0ff7a1db29a3543d295da3c33a1824277ed73d39 (diff)
parent4d0aeae567e19e68747fd2869741fee11a4df7c4 (diff)
Merge pull request #186 from Cqoicebordel/add-bang-autocompletion
Add '?' bang to the autocompleter
-rw-r--r--searx/autocomplete.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/searx/autocomplete.py b/searx/autocomplete.py
index 7ebebf1de..2777a0ca7 100644
--- a/searx/autocomplete.py
+++ b/searx/autocomplete.py
@@ -35,33 +35,34 @@ def searx_bang(full_query):
results = []
# check if current query stats with !bang
- if full_query.getSearchQuery()[0] == '!':
+ first_char = full_query.getSearchQuery()[0]
+ if first_char == '!' or first_char == '?':
if len(full_query.getSearchQuery()) == 1:
# show some example queries
# TODO, check if engine is not avaliable
- results.append("!images")
- results.append("!wikipedia")
- results.append("!osm")
+ results.append(first_char + "images")
+ results.append(first_char + "wikipedia")
+ results.append(first_char + "osm")
else:
engine_query = full_query.getSearchQuery()[1:]
# check if query starts with categorie name
for categorie in categories:
if categorie.startswith(engine_query):
- results.append('!{categorie}'.format(categorie=categorie))
+ results.append(first_char+'{categorie}'.format(categorie=categorie))
# check if query starts with engine name
for engine in engines:
if engine.startswith(engine_query.replace('_', ' ')):
- results.append('!{engine}'.format(engine=engine.replace(' ', '_')))
+ results.append(first_char+'{engine}'.format(engine=engine.replace(' ', '_')))
# check if query starts with engine shortcut
for engine_shortcut in engine_shortcuts:
if engine_shortcut.startswith(engine_query):
- results.append('!{engine_shortcut}'.format(engine_shortcut=engine_shortcut))
+ results.append(first_char+'{engine_shortcut}'.format(engine_shortcut=engine_shortcut))
# check if current query stats with :bang
- elif full_query.getSearchQuery()[0] == ':':
+ elif first_char == ':':
if len(full_query.getSearchQuery()) == 1:
# show some example queries
results.append(":en")