mpd and yawn widget are now asynchronous

[etc/awesome.git] / widgets / fs.lua

diff --git a/widgets/fs.lua b/widgets/fs.lua
index b43405604ef5efd5b88336b2020f964d04d6a9d6..8127c287c39dedb2173af0c1cf53272bf3a45c30 100644 (file)
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -40,17 +40,18 @@ function fs:show(t_out)
     fs:hide()
 
     local f = io.popen(helpers.scripts_dir .. "dfs")
     fs:hide()
 
     local f = io.popen(helpers.scripts_dir .. "dfs")

-    ws = f:read("*all"):gsub("\n*$", "")
+    ws = f:read("*a"):gsub("\n*$", "")

     f:close()
 
     notification = naughty.notify({
         preset = fs_notification_preset,
         text = ws,
     f:close()
 
     notification = naughty.notify({
         preset = fs_notification_preset,
         text = ws,

-       timeout = t_out
+        timeout = t_out,
+        screen = client.focus and client.focus.screen or 1

     })
 end
 
     })
 end
 

--- Units definitions
+-- Unit definitions

 local unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
 
 local function worker(args)
 local unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
 
 local function worker(args)


@@ -65,8 +66,8 @@ local function worker(args)
 
     function update()
         fs_info = {}
 
     function update()
         fs_info = {}

-
-        local f = io.popen("LC_ALL=C df -kP")
+        fs_now  = {}
+        local f = io.popen("LC_ALL=C df -kP " .. partition)

 
         for line in f:lines() do -- Match: (size) (used)(avail)(use%) (mount)
             local s     = string.match(line, "^.-[%s]([%d]+)")
 
         for line in f:lines() do -- Match: (size) (used)(avail)(use%) (mount)
             local s     = string.match(line, "^.-[%s]([%d]+)")


@@ -83,24 +84,23 @@ local function worker(args)
 
         f:close()
 
 
         f:close()
 

-        -- chosen partition easy stuff
-        -- you can however check whatever partition else
-        used      = tonumber(fs_info[partition .. " used_p"])
-        available = tonumber(fs_info[partition .. " avail_p"])
-        size_mb   = tonumber(fs_info[partition .. " size_mb"])
-        size_gb   = tonumber(fs_info[partition .. " size_gb"])
+        fs_now.used      = tonumber(fs_info[partition .. " used_p"])  or 0
+        fs_now.available = tonumber(fs_info[partition .. " avail_p"]) or 0
+        fs_now.size_mb   = tonumber(fs_info[partition .. " size_mb"]) or 0
+        fs_now.size_gb   = tonumber(fs_info[partition .. " size_gb"]) or 0

 
         widget = fs.widget
         settings()
 
 
         widget = fs.widget
         settings()
 

-        if used >= 99 and not helpers.get_map("fs")
+        if fs_now.used >= 99 and not helpers.get_map("fs")

         then
             naughty.notify({
                 title = "warning",
                 text = partition .. " ran out!\nmake some room",
                 timeout = 8,
                 fg = "#000000",
         then
             naughty.notify({
                 title = "warning",
                 text = partition .. " ran out!\nmake some room",
                 timeout = 8,
                 fg = "#000000",

-                bg = "#FFFFFF"
+                bg = "#FFFFFF",
+                screen = client.focus and client.focus.screen or 1

             })
             helpers.set_map("fs", true)
         else
             })
             helpers.set_map("fs", true)
         else