Skip to content

commands.lua: add quotes to file completion #18336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guidocella wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −3
Open

commands.lua: add quotes to file completion #18336

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions player/lua/commands.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,10 +274,24 @@ local function file_list(directory)
directory = mp.command_native({"expand-path", directory})
end

local files = utils.readdir(directory, "files") or {}
local files = {}

for i, file in pairs(utils.readdir(directory, "files")) do
if directory == "." and completion_append == "" and file:find("%s") then
files[i] = "'" .. file .. "'"
elseif completion_append ~= "" then
files[i] = file .. completion_append
else
files[i] = file
end
end

for _, dir in pairs(utils.readdir(directory, "dirs") or {}) do
files[#files + 1] = dir .. path_separator
if directory == "." and completion_append == "" and dir:find("%s") then
files[#files + 1] = "'" .. dir .. path_separator
else
files[#files + 1] = dir .. path_separator
end
end

return files
Expand All @@ -289,11 +303,13 @@ local function handle_file_completion(before_cur)

completion_pos = completion_pos + last_component_pos - 1

local files = file_list(directory)

-- Don"t use completion_append for file completion to not add quotes after
-- directories whose entries you may want to complete afterwards.
completion_append = ""

return file_list(directory)
return files
end

local function handle_choice_completion(option, before_cur)
Expand Down
Loading