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

E-book viewer: Show an error message when an invalid nearby search expression is used. See #2104850 (Private bug)

Browse Source
This commit is contained in:
Kovid Goyal 2025-03-31 10:32:34 +05:30
parent dbdc0ecabd
commit 735830ef1a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/calibre/gui2/viewer/search.py
View File

@ -26,7 +26,7 @@ from qt.core import (
) )
from calibre.ebooks.conversion.search_replace import REGEX_FLAGS from calibre.ebooks.conversion.search_replace import REGEX_FLAGS
from calibre.gui2 import warning_dialog from calibre.gui2 import error_dialog, warning_dialog
from calibre.gui2.gestures import GestureManager from calibre.gui2.gestures import GestureManager
from calibre.gui2.progress_indicator import ProgressIndicator from calibre.gui2.progress_indicator import ProgressIndicator
from calibre.gui2.viewer import get_boss from calibre.gui2.viewer import get_boss
@ -103,8 +103,8 @@ def words_and_interval_for_near(expr, default_interval=60):
words = [] words = []
interval = default_interval interval = default_interval
for q in parts: for i, q in enumerate(parts):
if q is parts[-1] and q.isdigit(): if q is parts[-1] and q.isdigit() and i > 1:
interval = int(q) interval = int(q)
else: else:
words.append(text_to_regex(q)) words.append(text_to_regex(q))
@ -154,12 +154,29 @@ class Search:
flags = self.regex_flags flags = self.regex_flags
flags |= regex.DOTALL flags |= regex.DOTALL
match_any_word = r'(?:\b(?:' + '|'.join(words) + r')\b)' match_any_word = r'(?:\b(?:' + '|'.join(words) + r')\b)'
joiner = '.{1,%d}' % interval # noqa: UP031 joiner = f'.{{1,{interval}}}'
full_pat = regex.compile(joiner.join(match_any_word for x in words), flags=flags) full_pat = regex.compile(joiner.join(match_any_word for x in words), flags=flags)
word_pats = tuple(regex.compile(rf'\b{x}\b', flags) for x in words) word_pats = tuple(regex.compile(rf'\b{x}\b', flags) for x in words)
self._nsd = word_pats, full_pat self._nsd = word_pats, full_pat
return self._nsd return self._nsd
def validate(self, gui) -> bool:
if self.mode == 'near':
word_pats, full_pat = self.near_search_data
if len(word_pats) < 2:
error_dialog(gui, _('Invalid search expression'), _(
'In Nearby words mode, you must specify at least two words and an optional trailing number of characters.'
' The expression: {} does not have at least two words.').format(self.text), show=True)
return False
elif self.mode == 'regex':
try:
self.regex
except Exception as e:
error_dialog(gui, _('Invalid search expression'), _(
'The search expression {} is not a valid regex.').format(self.text), det_msg=str(e), show=True)
return False
return True
@property @property
def is_empty(self): def is_empty(self):
if not self.text: if not self.text:
@ -802,6 +819,8 @@ class SearchPanel(QWidget): # {{{
if self.current_search is not None and search_query == self.current_search: if self.current_search is not None and search_query == self.current_search:
self.find_next_requested(search_query.backwards) self.find_next_requested(search_query.backwards)
return return
if not search_query.validate(self):
return
if self.searcher is None: if self.searcher is None:
self.searcher = Thread(name='Searcher', target=self.run_searches) self.searcher = Thread(name='Searcher', target=self.run_searches)
self.searcher.daemon = True self.searcher.daemon = True