fs: asynchronous: fs.show too

diff --git a/widgets/base.lua b/widgets/base.lua
index 642a858b7109d91bfc73e7c1cfdbfe1d02d1aac0..af3d2c04fbf253f97058dd6bb28fe3136503f1e9 100644 (file)
--- a/widgets/base.lua
+++ b/widgets/base.lua
@@ -22,7 +22,7 @@ local function worker(args)
     local cmd      = args.cmd or ""
     local settings = args.settings or function() end
 
     local cmd      = args.cmd or ""
     local settings = args.settings or function() end
 

-    base.widget = wibox.widget.textbox('')
+    base.widget = wibox.widget.textbox()

 
     function base.update()
         output = read_pipe(cmd)
 
     function base.update()
         output = read_pipe(cmd)

diff --git a/widgets/fs.lua b/widgets/fs.lua
index 374d6eba05af0e57557dc6514b629648f40827f3..d5dd49ad8ad3c30ab7112301d839e4d1bc44cbe5 100644 (file)
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -26,25 +26,29 @@ local fs = {}
 -- Unit definitions
 fs.unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
 
 -- Unit definitions
 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)
     fs.hide()
 
 
 function fs.show(seconds, scr)
     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
         fs.notification_preset.screen = focused()
     elseif scr then
         fs.notification_preset.screen = scr
     end
 
     if fs.followtag then
         fs.notification_preset.screen = focused()
     elseif scr then
         fs.notification_preset.screen = scr
     end
 

-    fs.notification = naughty.notify({
-        preset      = fs.notification_preset,
-        text        = ws,
-        timeout     = seconds or 5,
-    })
+    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)

 end
 
 local function worker(args)
 end
 
 local function worker(args)