]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/fs.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

abase renamed to watch; #312: wiki updated
[etc/awesome.git] / widgets / fs.lua
index 4e9f04b29268ba12bf3598d475a36fa346dd9c9c..ec87191766fbf79315944d92154a11d2ac2f277e 100644 (file)
@@ -20,10 +20,7 @@ local setmetatable = setmetatable
 
 -- File system disk space usage
 -- lain.widgets.fs
-local fs = helpers.make_widget_textbox()
-
--- Unit definitions
-fs.unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
+local fs = { unit  = { ["mb"] = 1024, ["gb"] = 1024^2 } }
 
 function fs.hide()
     if not fs.notification then return end
@@ -61,17 +58,20 @@ local function worker(args)
     fs.notification_preset = args.notification_preset
 
     if not fs.notification_preset then
-        fs.notification_preset      = naughty.config.defaults
-        fs.notification_preset.font = "Monospace 10"
-        fs.notification_preset.fg   = "#FFFFFF"
-        fs.notification_preset.bg   = "#000000"
+        fs.notification_preset = {
+            font = "Monospace 10",
+            fg   = "#FFFFFF",
+            bg   = "#000000"
+        }
     end
 
+    fs.widget = wibox.widget.textbox()
+
     helpers.set_map(partition, false)
 
     function fs.update()
         fs_info, fs_now  = {}, {}
-        helpers.async({ shell, "-c", "LC_ALL=C df -k --output=target,size,used,avail,pcent" }, function(f)
+        helpers.async({ shell, "-c", "/usr/bin/env LC_ALL=C df -k --output=target,size,used,avail,pcent" }, function(f)
             for line in string.gmatch(f, "\n[^\n]+") do
                 local m,s,u,a,p = string.match(line, "(/.-%s).-(%d+).-(%d+).-(%d+).-([%d]+)%%")
                 m = m:gsub(" ", "") -- clean target from any whitespace
@@ -99,7 +99,7 @@ local function worker(args)
             widget = fs.widget
             settings()
 
-            if notify == "on" and tonumber(fs_now.used) >= 99 and not helpers.get_map(partition) then
+            if notify == "on" and #fs_now.used > 0 and tonumber(fs_now.used) >= 99 and not helpers.get_map(partition) then
                 naughty.notify({
                     preset = naughty.config.presets.critical,
                     title  = "Warning",
@@ -124,7 +124,7 @@ local function worker(args)
 
     helpers.newtimer(partition, timeout, fs.update)
 
-    return setmetatable(fs, { __index = fs.widget })
+    return fs
 end
 
 return setmetatable(fs, { __call = function(_, ...) return worker(...) end })