mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-19 19:42:24 +02:00
Code

console.lua: pre-filter searched commands if the line is filled

Browse Source 
If you type something before pressing Ctrl+r, filter the commands
containing the typed line.

fuzzy_find() is modified to not code a separate case when the line is
empty in both handle_edit() or search_history().
This commit is contained in:
Guido Cella 2024-08-23 19:12:38 +02:00 committed by Kacper Michajłow
parent 92f052c14e
commit 64a0e31aa9
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
player/lua/console.lua
View File

@ -357,9 +357,11 @@ end
local function fuzzy_find(needle, haystacks)
local result = require 'mp.fzy'.filter(needle, haystacks)
table.sort(result, function (i, j)
return i[3] > j[3]
end)
if line ~= '' then -- Prevent table.sort() from reordering the items.
table.sort(result, function (i, j)
return i[3] > j[3]
end)
end
for i, value in ipairs(result) do
result[i] = value[1]
end
@ -639,14 +641,8 @@ local function handle_edit()
matches = {}
selected_match = 1
if line == '' then
for i, item in ipairs(selectable_items) do
matches[i] = { index = i, text = item }
end
else
for i, match in ipairs(fuzzy_find(line, selectable_items)) do
matches[i] = { index = match, text = selectable_items[match] }
end
for i, match in ipairs(fuzzy_find(line, selectable_items)) do
matches[i] = { index = match, text = selectable_items[match] }
end
end
@ -902,7 +898,10 @@ local function search_history()
for i = 1, #history do
selectable_items[i] = history[#history + 1 - i]
matches[i] = { index = i, text = history[#history + 1 - i] }
end
for i, match in ipairs(fuzzy_find(line, selectable_items)) do
matches[i] = { index = match, text = selectable_items[match] }
end
update()