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

Friendlier error message when user inputs invalid regex. Fixes #1321311 [Edit Book: Strange error because of wront syntax in Regex](https://bugs.launchpad.net/calibre/+bug/1321311)

Browse Source
This commit is contained in:
Kovid Goyal 2014-05-20 21:54:56 +05:30
parent 0efd5c5515
commit 245617c745
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/calibre/gui2/tweak_book/search.py
View File

@ -829,6 +829,12 @@ def validate_search_request(name, searchable_names, has_marked_text, state, gui_
return False return False
return True return True
class InvalidRegex(regex.error):
def __init__(self, raw, e):
regex.error.__init__(self, e.message)
self.regex = raw
def get_search_regex(state): def get_search_regex(state):
raw = state['find'] raw = state['find']
if state['mode'] != 'regex': if state['mode'] != 'regex':
@ -842,7 +848,11 @@ def get_search_regex(state):
flags |= regex.REVERSE flags |= regex.REVERSE
ans = regex_cache.get((flags, raw), None) ans = regex_cache.get((flags, raw), None)
if ans is None: if ans is None:
ans = regex_cache[(flags, raw)] = regex.compile(raw, flags=flags) try:
ans = regex_cache[(flags, raw)] = regex.compile(raw, flags=flags)
except regex.error as e:
raise InvalidRegex(raw, e)
return ans return ans
def initialize_search_request(state, action, current_editor, current_editor_name, searchable_names): def initialize_search_request(state, action, current_editor, current_editor_name, searchable_names):
@ -894,7 +904,12 @@ def run_search(
if len(searches) > 1: if len(searches) > 1:
errfind = _('the selected searches') errfind = _('the selected searches')
searches = [(get_search_regex(search), search['replace']) for search in searches] try:
searches = [(get_search_regex(search), search['replace']) for search in searches]
except InvalidRegex as e:
return error_dialog(gui_parent, _('Invalid regex'), '<p>' + _(
'The regular expression you entered is invalid: <pre>{0}</pre>With error: {1}').format(
prepare_string_for_xml(e.regex), e.message), show=True)
def no_match(): def no_match():
QApplication.restoreOverrideCursor() QApplication.restoreOverrideCursor()