Fix project search and status view for new add directory feature
This commit is contained in:
@@ -73,7 +73,7 @@ command.add(nil, {
|
||||
|
||||
["core:find-file"] = function()
|
||||
local files = {}
|
||||
for dir, item in core.project_files() do
|
||||
for dir, item in core.get_project_files() do
|
||||
if item.type == "file" then
|
||||
local filename = dir == core.project_dir and item.filename:match('^[/\\](.+)') or dir .. item.filename
|
||||
table.insert(files, common.home_encode(filename))
|
||||
|
||||
+11
-1
@@ -155,12 +155,22 @@ local function project_files_iter(state)
|
||||
return dir.name, dir.files[state.file_index]
|
||||
end
|
||||
|
||||
function core.project_files()
|
||||
|
||||
function core.get_project_files()
|
||||
local state = { dir_index = 1, file_index = 0 }
|
||||
return project_files_iter, state
|
||||
end
|
||||
|
||||
|
||||
function core.project_files_number()
|
||||
local n = 0
|
||||
for i = 1, #core.project_directories do
|
||||
n = n + #core.project_directories[i].files
|
||||
end
|
||||
return n
|
||||
end
|
||||
|
||||
|
||||
-- create a directory using mkdir but may need to create the parent
|
||||
-- directories as well.
|
||||
local function create_user_directory()
|
||||
|
||||
@@ -120,9 +120,7 @@ function StatusView:get_items()
|
||||
style.icon_font, "g",
|
||||
style.font, style.dim, self.separator2,
|
||||
#core.docs, style.text, " / ",
|
||||
-- FIXME: the number of file should be calculated
|
||||
-- across directories.
|
||||
#core.project_directories[1].files, " files"
|
||||
core.project_files_number(), " files"
|
||||
}
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user