Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-08-07 09:01:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Handle failure to select match more gracefully

Browse Source
This commit is contained in:
Kovid Goyal 2020-12-12 17:03:17 +05:30
parent 205d5d432c
commit 0348bf9ad5
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pyj/read_book/find.pyj
View File

@ -138,7 +138,11 @@ def reset_find_caches():
def select_find_result(match):
sel = window.getSelection()
sel.setBaseAndExtent(match.start_node, match.start_offset, match.end_node, match.end_offset)
try:
sel.setBaseAndExtent(match.start_node, match.start_offset, match.end_node, match.end_offset)
except: # if offset is outside node
return False
return True
def select_search_result(sr):
@ -158,8 +162,7 @@ def select_search_result(sr):
match = find_specific_occurrence(q, int(sr.index), before_len, after_len, cache.text_map, sr.from_offset)
if not match:
return False
select_find_result(match)
return True
return select_find_result(match)
def select_tts_mark(idx_in_flat_text):
@ -175,5 +178,4 @@ def select_tts_mark(idx_in_flat_text):
match = get_occurrence_data(cache.text_map.node_list, idx_in_flat_text, idx_in_flat_text + word_length)
if not match:
return False
select_find_result(match)
return True
return select_find_result(match)