renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CRe: fix issues with case sensitive and regex search (#7947)

Browse Source 
Fix crash with previous commit.
Show regex checkbox only with cre documents.
This commit is contained in:
zwim
2021-07-08 23:30:37 +02:00
committed by GitHub
parent 826a765705
commit 4d9d599a6a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/apps/reader/modules/readersearch.lua
View File

@@ -104,7 +104,7 @@ function ReaderSearch:onShowFulltextSearchInput()
self.last_search_text = self.input_dialog:getInputText()
self.use_regex = self.check_button_regex.checked
self.case_insensitive = not self.check_button_case.checked
local regex_error = self.ui.document:checkRegex(self.input_dialog:getInputText())
local regex_error = self.use_regex and self.ui.document:checkRegex(self.input_dialog:getInputText())
if self.use_regex and regex_error ~= 0 then
logger.dbg("ReaderSearch: regex error", regex_error, SRELL_ERROR_CODES[regex_error])
local error_message = _("Invalid regular expression")
@@ -128,7 +128,7 @@ function ReaderSearch:onShowFulltextSearchInput()
self.last_search_text = self.input_dialog:getInputText()
self.use_regex = self.check_button_regex.checked
self.case_insensitive = not self.check_button_case.checked
local regex_error = self.ui.document:checkRegex(self.input_dialog:getInputText())
local regex_error = self.use_regex and self.ui.document:checkRegex(self.input_dialog:getInputText())
if self.use_regex and regex_error ~= 0 then
logger.dbg("ReaderSearch: regex error", regex_error, SRELL_ERROR_CODES[regex_error])
local error_message = _("Invalid regular expression")
@@ -183,7 +183,7 @@ function ReaderSearch:onShowFulltextSearchInput()
VerticalGroup:new{
align = "left",
self.check_button_case,
self.check_button_regex,
not self.ui.document.info.has_pages and self.check_button_regex or nil,
},
}
@@ -385,8 +385,8 @@ function ReaderSearch:search(pattern, origin, regex, case_insensitive)
Device:setIgnoreInput(true)
local retval, words_found = self.ui.document:findText(pattern, origin, direction, case_insensitive, page, regex, self.max_hits)
Device:setIgnoreInput(false)
local regex_retval = self.ui.document:getAndClearRegexSearchError();
if regex_retval ~= 0 then
local regex_retval = regex and self.ui.document:getAndClearRegexSearchError();
if regex and regex_retval ~= 0 then
local error_message
if SRELL_ERROR_CODES[regex_retval] then
error_message = SRELL_ERROR_CODES[regex_retval]