awesomewm-mirrors
/
vicious
mirror of https://github.com/vicious-widgets/vicious.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Escape % before using strings in gsub

This commit is contained in:
Constantin Piber 2022-04-19 11:52:13 +02:00 committed by Nguyễn Gia Phong
parent b20f68bdb7
commit 51707f3917
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
helpers.lua
View File

@ -10,6 +10,7 @@
-- Copyright (C) 2018-2019 Nguyễn Gia Phong <vn.mcsinyx@gmail.com> -- Copyright (C) 2018-2019 Nguyễn Gia Phong <vn.mcsinyx@gmail.com>
-- Copyright (C) 2019 Alexander Koch <lynix47@gmail.com> -- Copyright (C) 2019 Alexander Koch <lynix47@gmail.com>
-- Copyright (C) 2019 Enric Morales <me@enric.me> -- Copyright (C) 2019 Enric Morales <me@enric.me>
-- Copyright (C) 2022 Constantin Piber <cp.piber@gmail.com>
-- --
-- This file is part of Vicious. -- This file is part of Vicious.
-- --
@ -33,6 +34,7 @@ local rawget = rawget
local require = require local require = require
local tonumber = tonumber local tonumber = tonumber
local tostring = tostring local tostring = tostring
local type = type
local io = { open = io.open, popen = io.popen } local io = { open = io.open, popen = io.popen }
local setmetatable = setmetatable local setmetatable = setmetatable
local getmetatable = getmetatable local getmetatable = getmetatable
@ -164,11 +166,12 @@ end
-- {{{ Format a string with args -- {{{ Format a string with args
function helpers.format(format, args) function helpers.format(format, args)
for var, val in pairs(args) do for var, val in pairs(args) do
format = format:gsub("$" .. (tonumber(var) and var or if tonumber(var) == nil then
var:gsub("[-+?*]", function(i) return "%"..i end)), var = var:gsub("[-+?*]", function(i) return "%"..i end)
val) end
if type(val) == "string" then val = val:gsub("%%", "%%%%") end
format = format:gsub("$" .. var, val)
end end
return format return format
end end
-- }}} -- }}}