enhancement: unique timers for widgets; #114

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

diff --git a/widgets/fs.lua b/widgets/fs.lua
index 3b99cbaf9a60dab18c9612c07fdee39ac3dc90f6..fab61bd5a53ed9392d9c0f4a0599a1d70f1ed350 100644 (file)
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -61,12 +61,12 @@ local function worker(args)
 
     fs.widget = wibox.widget.textbox('')
 
 
     fs.widget = wibox.widget.textbox('')
 

-    helpers.set_map("fs", false)
+    helpers.set_map(partition, false)

 
     function update()
         fs_info = {}
         fs_now  = {}
 
     function update()
         fs_info = {}
         fs_now  = {}

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

 
         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]+)")


@@ -91,7 +91,7 @@ local function worker(args)
         widget = fs.widget
         settings()
 
         widget = fs.widget
         settings()
 

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

         then
             naughty.notify({
                 title = "warning",
         then
             naughty.notify({
                 title = "warning",


@@ -100,17 +100,17 @@ local function worker(args)
                 fg = "#000000",
                 bg = "#FFFFFF",
             })
                 fg = "#000000",
                 bg = "#FFFFFF",
             })

-            helpers.set_map("fs", true)
+            helpers.set_map(partition, true)

         else
         else

-            helpers.set_map("fs", false)
+            helpers.set_map(partition, false)

         end
     end
 
         end
     end
 

-    helpers.newtimer(partition, timeout, update)
-

     widget:connect_signal('mouse::enter', function () fs:show(0) end)
     widget:connect_signal('mouse::leave', function () fs:hide() end)
 
     widget:connect_signal('mouse::enter', function () fs:show(0) end)
     widget:connect_signal('mouse::leave', function () fs:hide() end)
 

+    helpers.newtimer(partition, timeout, update)
+

     return setmetatable(fs, { __index = fs.widget })
 end
 
     return setmetatable(fs, { __index = fs.widget })
 end