From 59fa3f9402674e4d22d373b9f0d271605f573839 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 17 May 2021 11:22:37 +0530 Subject: [PATCH] Wrap-around the search --- src/pyj/read_book/search_worker.pyj | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pyj/read_book/search_worker.pyj b/src/pyj/read_book/search_worker.pyj index fd99242aba..e2b6352b16 100644 --- a/src/pyj/read_book/search_worker.pyj +++ b/src/pyj/read_book/search_worker.pyj @@ -39,12 +39,13 @@ def send_search_complete(): def search_in_text_of(name): - pass + print('searching in:', name) -def queue_next_spine_item(spine_idx): +def queue_next_spine_item(spine_idx, allow_current_name): + spine_idx %= wc.current_query.spine.length name = wc.current_query.spine[spine_idx] - if not name: + if not name or (not allow_current_name and name is wc.current_query.current_name): send_search_complete() return if wc.text_cache[name]: @@ -80,7 +81,7 @@ def perform_search(query): idx = query.spine.indexOf(query.current_name) if idx < 0: idx = 0 - queue_next_spine_item(idx) + queue_next_spine_item(idx, True) def worker_connection_done():