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

Add cache for menubar.utils.lookup_icon 

I have tried to use `utils.icon_cache =
require("gears.cache").new(utils.lookup_icon_uncached)`, but that
appears to get garbage-collected too much?!
This commit is contained in:
Daniel Hahler 2015-10-12 00:25:39 +02:00
parent 7fa3dc97c8
commit efbddb5875
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/menubar/utils.lua
View File

@ -115,11 +115,11 @@ local function get_icon_lookup_path()
end end
--- Lookup an icon in different folders of the filesystem. --- Lookup an icon in different folders of the filesystem.
-- @param icon_file Short or full name of the icon. -- @tparam string icon_file Short or full name of the icon.
-- @return full name of the icon. -- @treturn string|boolean Full name of the icon, or false on failure.
function utils.lookup_icon(icon_file) function utils.lookup_icon_uncached(icon_file)
if not icon_file or icon_file == "" then if not icon_file or icon_file == "" then
return default_icon return false
end end
if icon_file:sub(1, 1) == '/' and is_format_supported(icon_file) then if icon_file:sub(1, 1) == '/' and is_format_supported(icon_file) then
@ -143,10 +143,21 @@ function utils.lookup_icon(icon_file)
end end
end end
end end
return default_icon return false
end end
end end
local lookup_icon_cache = {}
--- Lookup an icon in different folders of the filesystem (cached).
-- @param icon_file Short or full name of the icon.
-- @return full name of the icon.
function utils.lookup_icon(icon)
if not lookup_icon_cache[icon] and lookup_icon_cache[icon] ~= false then
lookup_icon_cache[icon] = utils.lookup_icon_uncached(icon)
end
return lookup_icon_cache[icon] or default_icon
end
--- Parse a .desktop file. --- Parse a .desktop file.
-- @param file The .desktop file. -- @param file The .desktop file.
-- @return A table with file entries. -- @return A table with file entries.