on master help sign in
Merge pull request #186 from Cqoicebordel/add-bang-autocompletion

Add '?' bang to the autocompleter

commitf6b42204148ad3f49165174ef5124090d30f7350 authorAdam Tauber <asciimoo@gmail.com> dateTue 20 Jan 2015, 13:41 (12 years ago) parent0ff7a1d4d0aeae
1 file changed+9−8
searx/autocomplete.py+9−8
searx/autocomplete.py+9−8
@@ -35,33 +35,34 @@ def searx_bang(full_query):
3535 results = []
3636
3737 # check if current query stats with !bang
38− if full_query.getSearchQuery()[0] == '!':
38+ first_char = full_query.getSearchQuery()[0]
39+ if first_char == '!' or first_char == '?':
3940 if len(full_query.getSearchQuery()) == 1:
4041 # show some example queries
4142 # TODO, check if engine is not avaliable
42− results.append("!images")
43− results.append("!wikipedia")
44− results.append("!osm")
43+ results.append(first_char + "images")
44+ results.append(first_char + "wikipedia")
45+ results.append(first_char + "osm")
4546 else:
4647 engine_query = full_query.getSearchQuery()[1:]
4748
4849 # check if query starts with categorie name
4950 for categorie in categories:
5051 if categorie.startswith(engine_query):
51− results.append('!{categorie}'.format(categorie=categorie))
52+ results.append(first_char+'{categorie}'.format(categorie=categorie))
5253
5354 # check if query starts with engine name
5455 for engine in engines:
5556 if engine.startswith(engine_query.replace('_', ' ')):
56− results.append('!{engine}'.format(engine=engine.replace(' ', '_')))
57+ results.append(first_char+'{engine}'.format(engine=engine.replace(' ', '_')))
5758
5859 # check if query starts with engine shortcut
5960 for engine_shortcut in engine_shortcuts:
6061 if engine_shortcut.startswith(engine_query):
61− results.append('!{engine_shortcut}'.format(engine_shortcut=engine_shortcut))
62+ results.append(first_char+'{engine_shortcut}'.format(engine_shortcut=engine_shortcut))
6263
6364 # check if current query stats with :bang
64− elif full_query.getSearchQuery()[0] == ':':
65+ elif first_char == ':':
6566 if len(full_query.getSearchQuery()) == 1:
6667 # show some example queries
6768 results.append(":en")