Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(menubar: utils: parse_dir): print to log the current failed directory instead of the root one

This commit is contained in:
actionless 2017-08-21 15:12:38 +02:00
parent 960f59b228
commit 0a75f09d1d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/menubar/utils.lua
View File

@ -285,19 +285,23 @@ end
-- @tparam table callback.programs Paths of found .desktop files. -- @tparam table callback.programs Paths of found .desktop files.
function utils.parse_dir(dir_path, callback) function utils.parse_dir(dir_path, callback)
local function get_readable_path(file)
return file:get_path() or file:get_uri()
end
local function parser(file, programs) local function parser(file, programs)
-- Except for "NONE" there is also NOFOLLOW_SYMLINKS -- Except for "NONE" there is also NOFOLLOW_SYMLINKS
local query = gio.FILE_ATTRIBUTE_STANDARD_NAME .. "," .. gio.FILE_ATTRIBUTE_STANDARD_TYPE local query = gio.FILE_ATTRIBUTE_STANDARD_NAME .. "," .. gio.FILE_ATTRIBUTE_STANDARD_TYPE
local enum, err = file:async_enumerate_children(query, gio.FileQueryInfoFlags.NONE) local enum, err = file:async_enumerate_children(query, gio.FileQueryInfoFlags.NONE)
if not enum then if not enum then
gdebug.print_warning(dir_path .. ": " .. tostring(err)) gdebug.print_warning(get_readable_path(file) .. ": " .. tostring(err))
return return
end end
local files_per_call = 100 -- Actual value is not that important local files_per_call = 100 -- Actual value is not that important
while true do while true do
local list, enum_err = enum:async_next_files(files_per_call) local list, enum_err = enum:async_next_files(files_per_call)
if enum_err then if enum_err then
gdebug.print_warning(dir_path .. ": " .. tostring(enum_err)) gdebug.print_error(get_readable_path(file) .. ": " .. tostring(enum_err))
return return
end end
for _, info in ipairs(list) do for _, info in ipairs(list) do