Miroirs/awesome
1
0
Fork 0
mirror of https://github.com/awesomeWM/awesome synced 2024-11-17 07:47:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

menubar.utils.parse_desktop_file: Use GKeyFile

Browse source 
This replaces our own, hand-written parser of desktop files with the one
that GLib provides. No functional changes intended.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2017-11-15 15:02:25 +01:00
parent e20068cb4a
commit e88f1e8735
1 changed files with 14 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
lib/menubar/utils.lua
View file

@ -7,7 +7,6 @@
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- Grab environment -- Grab environment
local io = io
local table = table local table = table
local ipairs = ipairs local ipairs = ipairs
local string = string local string = string
@ -260,36 +259,26 @@ end
-- @return A table with file entries. -- @return A table with file entries.
function utils.parse_desktop_file(file) function utils.parse_desktop_file(file)
local program = { show = true, file = file } local program = { show = true, file = file }
local desktop_entry = false
-- Parse the .desktop file. -- Parse the .desktop file.
-- We are interested in [Desktop Entry] group only. -- We are interested in [Desktop Entry] group only.
for line in io.lines(file) do local keyfile = glib.KeyFile()
line = utils.rtrim(line) if not keyfile:load_from_file(file, glib.KeyFileFlags.NONE) then
if line:find("^%s*#") then return nil
-- Skip comments.
(function() end)() -- I haven't found a nice way to silence luacheck here
elseif not desktop_entry and line == "[Desktop Entry]" then
desktop_entry = true
else
if line:sub(1, 1) == "[" and line:sub(-1) == "]" then
-- A declaration of new group - stop parsing
break
end
-- Grab the values
for key, value in line:gmatch("(%w+)%s*=%s*(.+)") do
if list_keys[key] then
program[key] = utils.parse_list(value)
else
program[key] = utils.unescape(value)
end
end
end
end end
-- In case [Desktop Entry] was not found -- In case [Desktop Entry] was not found
if not desktop_entry then return nil end if not keyfile:has_group("Desktop Entry") then
return nil
end
for _, key in pairs(keyfile:get_keys("Desktop Entry")) do
if list_keys[key] then
program[key] = keyfile:get_string_list("Desktop Entry", key)
else
program[key] = keyfile:get_string("Desktop Entry", key)
end
end
-- In case the (required) 'Name' entry was not found -- In case the (required) 'Name' entry was not found
if not program.Name or program.Name == '' then return nil end if not program.Name or program.Name == '' then return nil end