#115: also catching http.*//

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

diff --git a/widgets/fs.lua b/widgets/fs.lua
index b43405604ef5efd5b88336b2020f964d04d6a9d6..07490faa905cad335220b23bce4fd296bbc44bba 100644 (file)
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -14,7 +14,7 @@ local beautiful    = require("beautiful")
 local wibox        = require("wibox")
 local naughty      = require("naughty")
 
 local wibox        = require("wibox")
 local naughty      = require("naughty")
 

-local io           = io
+local io           = { popen  = io.popen }

 local pairs        = pairs
 local string       = { match  = string.match,
                        format = string.format }
 local pairs        = pairs
 local string       = { match  = string.match,
                        format = string.format }


@@ -46,11 +46,11 @@ function fs:show(t_out)
     notification = naughty.notify({
         preset = fs_notification_preset,
         text = ws,
     notification = naughty.notify({
         preset = fs_notification_preset,
         text = ws,

-       timeout = t_out
+        timeout = t_out,

     })
 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)


@@ -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 = {}
 
     function update()
         fs_info = {}

-
-        local f = io.popen("LC_ALL=C df -kP")
+        fs_now  = {}
+        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]+)")


@@ -83,35 +83,33 @@ 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(partition)

         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",

             })
             })

-            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)
+    fs.widget:connect_signal('mouse::enter', function () fs:show(0) end)
+    fs.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