pikers
/
piker
3
0
Fork 0
Code Issues 2 Pull Requests 5 Packages Projects Releases Wiki Activity

Avoid clearing cached results; detect repeats later

status_bar
Tyler Goodlet 2021-06-10 11:56:41 -04:00
parent 0dcadec11a
commit 84f61c9a92
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
piker/ui/_search.py
View File

@ -702,7 +702,9 @@ async def fill_results(
# kb debouncing pauses (bracket defaults) # kb debouncing pauses (bracket defaults)
min_pause_time: float = 0.01, # absolute min typing throttle min_pause_time: float = 0.01, # absolute min typing throttle
max_pause_time: float = 6/16, # max pause required before slow relay
# max pause required before slow relay
max_pause_time: float = 6/16 + 0.001,
) -> None: ) -> None:
"""Task to search through providers and fill in possible """Task to search through providers and fill in possible
@ -751,11 +753,6 @@ async def fill_results(
_search_active = trio.Event() _search_active = trio.Event()
break break
if repeats > 2 and period > max_pause_time:
_search_active = trio.Event()
repeats = 0
break
if text == last_text: if text == last_text:
repeats += 1 repeats += 1
@ -763,9 +760,8 @@ async def fill_results(
# print('search currently disabled') # print('search currently disabled')
break break
log.debug(f'Search req for {text}')
already_has_results = has_results[text] already_has_results = has_results[text]
log.debug(f'Search req for {text}')
# issue multi-provider fan-out search request and place # issue multi-provider fan-out search request and place
# "searching.." statuses on outstanding results providers # "searching.." statuses on outstanding results providers
@ -774,20 +770,22 @@ async def fill_results(
for provider, (search, pause) in ( for provider, (search, pause) in (
_searcher_cache.copy().items() _searcher_cache.copy().items()
): ):
# TODO: it may make more sense TO NOT search the cache in a bg
# task since we know it's fully cpu-bound.
if provider != 'cache':
view.clear_section(
provider, status_field='-> searchin..')
# XXX: only conduct search on this backend if it's # XXX: only conduct search on this backend if it's
# registered for the corresponding pause period # registered for the corresponding pause period AND
# AND it hasn't already been searched with the # it hasn't already been searched with the current
# current input pattern (in which case just look up # input pattern (in which case just look up the old
# the old results). # results).
if (period >= pause) and ( if (period >= pause) and (
provider not in already_has_results provider not in already_has_results
): ):
# TODO: it may make more sense TO NOT search the
# cache in a bg task since we know it's fully
# cpu-bound.
if provider != 'cache':
view.clear_section(
provider, status_field='-> searchin..')
await n.start( await n.start(
pack_matches, pack_matches,
view, view,
@ -815,6 +813,11 @@ async def fill_results(
else: else:
view.clear_section(provider) view.clear_section(provider)
if repeats > 2 and period > max_pause_time:
_search_active = trio.Event()
repeats = 0
break
bar.show() bar.show()