wiki updated

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

diff --git a/widgets/fs.lua b/widgets/fs.lua
index f9342487117ecf05b52c6085ebbfdf454019e653..dbd45bfa79be7c26bfb52cfb0d5d60109e128e9d 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 io           = io
+local io           = { popen  = io.popen }
 local pairs        = pairs
 local string       = { match  = string.match,
                        format = string.format }
@@ -24,8 +24,10 @@ local setmetatable = setmetatable
 
 -- File system disk space usage
 -- lain.widgets.fs
-local fs = { notification_preset = {} }
-local notification = nil
+local fs = {}
+
+local notification  = nil
+fs_notification_preset = { fg = beautiful.fg_normal }
 
 function fs:hide()
     if notification ~= nil then
@@ -34,7 +36,7 @@ function fs:hide()
     end
 end
 
-function fs:show(t_out)
+function fs:show(t_out, scr)
     fs:hide()
 
     local f = io.popen(helpers.scripts_dir .. "dfs")
@@ -42,29 +44,30 @@ function fs:show(t_out)
     f:close()
 
     notification = naughty.notify({
-        preset = fs.notification_preset,
-        text = ws,
-       timeout = t_out
+        preset  = fs_notification_preset,
+        text    = ws,
+        timeout = t_out,
+        screen  = scr or 1
     })
 end
 
--- Units definitions
+-- Unit definitions
 local unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
 
 local function worker(args)
     local args      = args or {}
-    local partition = args.partition or "/"
     local timeout   = args.timeout or 600
+    local partition = args.partition or "/"
     local settings  = args.settings or function() end
 
-    widget = wibox.widget.textbox('')
+    fs.widget = wibox.widget.textbox('')
 
-    helpers.set_map("fs", false)
+    helpers.set_map(partition, false)
 
     function update()
-        fs_info = {} 
-
-        local f = io.popen("LC_ALL=C df -kP")
+        fs_info = {}
+        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]+)")
@@ -81,48 +84,35 @@ local function worker(args)
 
         f:close()
 
-        -- chosen partition easy stuff
-        -- you can however check whatever partition else
-        used = fs_info[partition .. " used_p"]
-        available = fs_info[partition .. " avail_p"]
-        size_mb = fs_info[partition .. " size_mb"]
-        size_gb = fs_info[partition .. " size_gb"]
-
-        notification_preset = { fg = beautiful.fg_normal }
+        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()
 
-        fs.notification_preset = notification_preset
-
-        if used >= 99 and not helpers.get_map("fs")
+        if fs_now.used >= 99 and not helpers.get_map(partition)
         then
-            naughty.notify({ 
+            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
-            helpers.set_map("fs", false)
+            helpers.set_map(partition, false)
         end
     end
 
-    helpers.newtimer("fs " .. partition, timeout, update)
-
-    widget:connect_signal('mouse::enter', function () fs:show(0) end)
-    widget:connect_signal('mouse::leave', function () fs:hide() end)
+    fs.widget:connect_signal('mouse::enter', function () fs:show(0, mouse.screen) end)
+    fs.widget:connect_signal('mouse::leave', function () fs:hide() end)
 
-    output = {
-        widget = widget,
-        show = function(t_out)
-                   update()
-                   fs:show(t_out)
-               end
-    }
+    helpers.newtimer(partition, timeout, update)
 
-    return setmetatable(output, { __index = output.widget })
+    return setmetatable(fs, { __index = fs.widget })
 end
 
 return setmetatable(fs, { __call = function(_, ...) return worker(...) end })