From e026598f728196cd2747d255e0cdc6194d0340ce Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Wed, 7 Dec 2022 18:41:48 +0100 Subject: [PATCH] TouchMenu: menu search without patterns (#9884) See . --- frontend/ui/widget/touchmenu.lua | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/frontend/ui/widget/touchmenu.lua b/frontend/ui/widget/touchmenu.lua index cbfd0cc16..641ced362 100644 --- a/frontend/ui/widget/touchmenu.lua +++ b/frontend/ui/widget/touchmenu.lua @@ -1010,7 +1010,7 @@ function TouchMenu:search(search_for) local next_text = text and (text .. "\n" .. indent .. entry_text) or (indent .. entry_text) local next_path = path .. "." .. i recurse(val[i], next_path, next_text, icon, depth) - if Utf8Proc.lowercase(entry_text):find(search_for) then + if Utf8Proc.lowercase(entry_text):find(search_for, 1, true) then table.insert(found_menu_items, {entry_text, icon, next_path, next_text}) end end @@ -1319,18 +1319,10 @@ function TouchMenu:onShowMenuSearch() text = _("Search"), callback = function() local search_for = search_dialog:getInputText() - local status, err = pcall( function() ("test_string"):find(search_for) end) - if status then - search_for = Utf8Proc.lowercase(search_for) - G_reader_settings:saveSetting("menu_search_string", search_for) - UIManager:close(search_dialog) - show_search_results(search_for) - else - err = err:sub(err:find("lua") + 10) -- 10 = strlen("lua:1165: ") - UIManager:show(InfoMessage:new{ - text = T(_("Malformed message:\n%1"), err) - }) - end + search_for = Utf8Proc.lowercase(search_for) + G_reader_settings:saveSetting("menu_search_string", search_for) + UIManager:close(search_dialog) + show_search_results(search_for) end, }, }