소스 검색

[fix] little autocompleter fix

Thomas Pointhuber 10 년 전
부모
커밋
c19b0899a4
2개의 변경된 파일6개의 추가작업 그리고 4개의 파일을 삭제
  1. 2
    2
      searx/autocomplete.py
  2. 4
    2
      searx/webapp.py

+ 2
- 2
searx/autocomplete.py 파일 보기

52
 
52
 
53
             # check if query starts with engine name
53
             # check if query starts with engine name
54
             for engine in engines:
54
             for engine in engines:
55
-                if engine.startswith(engine_query):
55
+                if engine.startswith(engine_query.replace('_', ' ')):
56
                     results.append('!{engine}'.format(engine=engine.replace(' ', '_')))
56
                     results.append('!{engine}'.format(engine=engine.replace(' ', '_')))
57
 
57
 
58
             # check if query starts with engine shortcut
58
             # check if query starts with engine shortcut
86
                     results.append(':{lang_name}'.format(lang_name=lang_name))
86
                     results.append(':{lang_name}'.format(lang_name=lang_name))
87
 
87
 
88
                 # check if query starts with country
88
                 # check if query starts with country
89
-                if country.startswith(engine_query):
89
+                if country.startswith(engine_query.replace('_', ' ')):
90
                     results.append(':{country}'.format(country=country.replace(' ', '_')))
90
                     results.append(':{country}'.format(country=country.replace(' ', '_')))
91
 
91
 
92
     # remove duplicates
92
     # remove duplicates

+ 4
- 2
searx/webapp.py 파일 보기

355
     # parse searx specific autocompleter results like !bang
355
     # parse searx specific autocompleter results like !bang
356
     raw_results = searx_bang(query)
356
     raw_results = searx_bang(query)
357
 
357
 
358
-    # run autocompletion
359
-    raw_results.extend(completer(query.getSearchQuery()))
358
+    # normal autocompletion results only appear if max 3. searx results returned
359
+    if len(raw_results) <= 3:
360
+        # run autocompletion
361
+        raw_results.extend(completer(query.getSearchQuery()))
360
 
362
 
361
     # parse results (write :language and !engine back to result string)
363
     # parse results (write :language and !engine back to result string)
362
     results = []
364
     results = []