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

fix #280

This commit is contained in:
copycat-killer 2017-01-24 18:42:44 +01:00
parent 1134630a54
commit 8ba5f4a7ef
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
widgets/fs.lua
View File

@ -20,7 +20,7 @@ local setmetatable = setmetatable
-- File system disk space usage -- File system disk space usage
-- lain.widgets.fs -- lain.widgets.fs
local fs = {} local fs = helpers.make_widget_textbox()
-- Unit definitions -- Unit definitions
fs.unit = { ["mb"] = 1024, ["gb"] = 1024^2 } fs.unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
@ -32,6 +32,8 @@ function fs.hide()
end end
function fs.show(seconds, scr) function fs.show(seconds, scr)
fs.update()
fs.hide() fs.hide()
if fs.followtag then if fs.followtag then
@ -40,15 +42,10 @@ function fs.show(seconds, scr)
fs.notification_preset.screen = scr or 1 fs.notification_preset.screen = scr or 1
end 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({ fs.notification = naughty.notify({
preset = fs.notification_preset, preset = fs.notification_preset,
text = ws:gsub("\n*$", ""), timeout = seconds or 5
timeout = seconds or 5,
}) })
end)
end end
local function worker(args) local function worker(args)
@ -70,11 +67,9 @@ local function worker(args)
fs.notification_preset.bg = "#000000" fs.notification_preset.bg = "#000000"
end end
fs.widget = wibox.widget.textbox()
helpers.set_map(partition, false) helpers.set_map(partition, false)
function update() function fs.update()
fs_info, fs_now = {}, {} fs_info, fs_now = {}, {}
helpers.async({ shell, "-c", "LC_ALL=C df -k --output=target,size,used,avail,pcent" }, 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 for line in string.gmatch(f, "\n[^\n]+") do
@ -115,6 +110,11 @@ local function worker(args)
helpers.set_map(partition, false) helpers.set_map(partition, false)
end end
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 end
if showpopup == "on" then if showpopup == "on" then
@ -122,7 +122,7 @@ local function worker(args)
fs.widget:connect_signal('mouse::leave', function () fs.hide() end) fs.widget:connect_signal('mouse::leave', function () fs.hide() end)
end end
helpers.newtimer(partition, timeout, update) helpers.newtimer(partition, timeout, fs.update)
return setmetatable(fs, { __index = fs.widget }) return setmetatable(fs, { __index = fs.widget })
end end