fs: asynchronous: fs.show too

This commit is contained in:
copycat-killer 2017-01-21 00:20:17 +01:00
parent 4148ccdfcd
commit 6f988d8eb7
2 changed files with 14 additions and 10 deletions

View File

@ -22,7 +22,7 @@ local function worker(args)
local cmd = args.cmd or "" local cmd = args.cmd or ""
local settings = args.settings or function() end local settings = args.settings or function() end
base.widget = wibox.widget.textbox('') base.widget = wibox.widget.textbox()
function base.update() function base.update()
output = read_pipe(cmd) output = read_pipe(cmd)

View File

@ -26,25 +26,29 @@ local fs = {}
-- Unit definitions -- Unit definitions
fs.unit = { ["mb"] = 1024, ["gb"] = 1024^2 } fs.unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
function fs.hide() naughty.destroy(fs.notification) end function fs.hide()
naughty.destroy(fs.notification)
fs.notification = nil
end
function fs.show(seconds, scr) function fs.show(seconds, scr)
fs.hide() fs.hide()
local cmd = (fs.options and string.format("dfs %s", fs.options)) or "dfs"
local ws = helpers.read_pipe(helpers.scripts_dir .. cmd):gsub("\n*$", "")
if fs.followtag then if fs.followtag then
fs.notification_preset.screen = focused() fs.notification_preset.screen = focused()
elseif scr then elseif scr then
fs.notification_preset.screen = scr fs.notification_preset.screen = scr
end end
fs.notification = naughty.notify({ local cmd = (fs.options and string.format("dfs %s", fs.options)) or "dfs"
preset = fs.notification_preset,
text = ws, helpers.async(helpers.scripts_dir .. cmd, function(ws)
timeout = seconds or 5, fs.notification = naughty.notify({
}) preset = fs.notification_preset,
text = ws:gsub("\n*$", ""),
timeout = seconds or 5,
})
end)
end end
local function worker(args) local function worker(args)