X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/8d37b9a1e4521a220f20ce2e1414f656aa3a5015..0ef82f83e0baaa2936b6204a24ee3b3b638fd409:/widgets/fs.lua?ds=sidebyside

diff --git a/widgets/fs.lua b/widgets/fs.lua
index f934248..b580010 100644
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -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
+notification_preset = { fg = beautiful.fg_normal }
 
 function fs:hide()
     if notification ~= nil then
@@ -42,7 +44,7 @@ function fs:show(t_out)
     f:close()
 
     notification = naughty.notify({
-        preset = fs.notification_preset,
+        preset = notification_preset,
         text = ws,
       	timeout = t_out
     })
@@ -53,15 +55,15 @@ 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)
 
-    function update()
+    function fs.update()
         fs_info = {} 
 
         local f = io.popen("LC_ALL=C df -kP")
@@ -83,17 +85,14 @@ local function worker(args)
 
         -- 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 }
+        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"])
 
+        widget = fs.widget
         settings()
 
-        fs.notification_preset = notification_preset
-
         if used >= 99 and not helpers.get_map("fs")
         then
             naughty.notify({ 
@@ -109,16 +108,16 @@ local function worker(args)
         end
     end
 
-    helpers.newtimer("fs " .. partition, timeout, update)
+    helpers.newtimer(partition, timeout, fs.update)
 
     widget:connect_signal('mouse::enter', function () fs:show(0) end)
     widget:connect_signal('mouse::leave', function () fs:hide() end)
 
     output = {
-        widget = widget,
+        widget = fs.widget,
         show = function(t_out)
-                   update()
-                   fs:show(t_out)
+                  fs.update()
+                  fs:show(t_out)
                end
     }