X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/099e23aac2372f11a6f2b9a8c0d62bdfd8ee85b6..1400e906708e907c268a37726a2c9852c4941377:/widgets/fs.lua?ds=sidebyside diff --git a/widgets/fs.lua b/widgets/fs.lua index 3a97d4c..c78b6cb 100644 --- a/widgets/fs.lua +++ b/widgets/fs.lua @@ -20,10 +20,7 @@ local setmetatable = setmetatable -- File system disk space usage -- lain.widgets.fs -local fs = {} - --- Unit definitions -fs.unit = { ["mb"] = 1024, ["gb"] = 1024^2 } +local fs = { unit = { ["mb"] = 1024, ["gb"] = 1024^2 } } function fs.hide() if not fs.notification then return end @@ -32,6 +29,8 @@ function fs.hide() end function fs.show(seconds, scr) + fs.update() + fs.hide() if fs.followtag then @@ -40,15 +39,10 @@ function fs.show(seconds, scr) fs.notification_preset.screen = scr or 1 end - local cmd = (fs.options and string.format("dfs %s", fs.options)) or "dfs" - - helpers.async(helpers.scripts_dir .. cmd, function(ws) - fs.notification = naughty.notify({ - preset = fs.notification_preset, - text = ws:gsub("\n*$", ""), - timeout = seconds or 5, - }) - end) + fs.notification = naughty.notify({ + preset = fs.notification_preset, + timeout = seconds or 5 + }) end local function worker(args) @@ -64,19 +58,20 @@ local function worker(args) fs.notification_preset = args.notification_preset if not fs.notification_preset then - fs.notification_preset = naughty.config.defaults - fs.notification_preset.font = "Monospace 10" - fs.notification_preset.fg = "#FFFFFF" - fs.notification_preset.bg = "#000000" + fs.notification_preset = { + font = "Monospace 10", + fg = "#FFFFFF", + bg = "#000000" + } end fs.widget = wibox.widget.textbox() helpers.set_map(partition, false) - function update() + function fs.update() fs_info, fs_now = {}, {} - helpers.async(string.format("%s -c 'LC_ALL=C df -k --output=target,size,used,avail,pcent'", shell), function(f) + helpers.async({ shell, "-c", "LC_ALL=C df -k --output=target,size,used,avail,pcent" }, function(f) for line in string.gmatch(f, "\n[^\n]+") do local m,s,u,a,p = string.match(line, "(/.-%s).-(%d+).-(%d+).-(%d+).-([%d]+)%%") m = m:gsub(" ", "") -- clean target from any whitespace @@ -115,6 +110,11 @@ local function worker(args) helpers.set_map(partition, false) end end) + + local notifycmd = (fs.options and string.format("dfs %s", fs.options)) or "dfs" + helpers.async(helpers.scripts_dir .. notifycmd, function(ws) + fs.notification_preset.text = ws:gsub("\n*$", "") + end) end if showpopup == "on" then @@ -122,9 +122,9 @@ local function worker(args) fs.widget:connect_signal('mouse::leave', function () fs.hide() end) end - helpers.newtimer(partition, timeout, update) + helpers.newtimer(partition, timeout, fs.update) - return setmetatable(fs, { __index = fs.widget }) + return fs end return setmetatable(fs, { __call = function(_, ...) return worker(...) end })