]> 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:

Fix typo so notification_preset can be overidden
[etc/awesome.git] / widgets / fs.lua
index 391c26009ed3e9960d16bb9ca5e25895330bd486..c78b6cbbf18028d458660cb3c7588258d594acff 100644 (file)
@@ -20,10 +20,7 @@ local setmetatable = setmetatable
 
 -- File system disk space usage
 -- lain.widgets.fs
-local fs = {}
-
--- 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
@@ -32,23 +29,20 @@ function fs.hide()
 end
 
 function fs.show(seconds, scr)
+    fs.update()
+
     fs.hide()
 
     if fs.followtag then
         fs.notification_preset.screen = focused()
     elseif scr then
-        fs.notification_preset.screen = scr
+        fs.notification_preset.screen = scr or 1
     end
 
-    local cmd = (fs.options and string.format("dfs %s", fs.options)) or "dfs"
-
-    helpers.async(helpers.scripts_dir .. cmd, function(ws)
-        fs.notification = naughty.notify({
-            preset      = fs.notification_preset,
-            text        = ws:gsub("\n*$", ""),
-            timeout     = seconds or 5,
-        })
-    end)
+    fs.notification = naughty.notify({
+        preset      = fs.notification_preset,
+        timeout     = seconds or 5
+    })
 end
 
 local function worker(args)
@@ -64,20 +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 update()
+    function fs.update()
         fs_info, fs_now  = {}, {}
-        helpers.async(string.format("%s -c 'LC_ALL=C df -k --output=target,size,used,avail,pcent'", shell), function(f)
+        helpers.async({ shell, "-c", "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
@@ -107,17 +101,20 @@ local function worker(args)
 
             if notify == "on" and tonumber(fs_now.used) >= 99 and not helpers.get_map(partition) then
                 naughty.notify({
-                    title   = "Warning",
-                    text    = partition .. " is empty!",
-                    timeout = 8,
-                    fg      = "#000000",
-                    bg      = "#FFFFFF"
+                    preset = naughty.config.presets.critical,
+                    title  = "Warning",
+                    text   = partition .. " is empty",
                 })
                 helpers.set_map(partition, true)
             else
                 helpers.set_map(partition, false)
             end
         end)
+
+        local notifycmd = (fs.options and string.format("dfs %s", fs.options)) or "dfs"
+        helpers.async(helpers.scripts_dir .. notifycmd, function(ws)
+            fs.notification_preset.text = ws:gsub("\n*$", "")
+        end)
     end
 
     if showpopup == "on" then
@@ -125,9 +122,9 @@ local function worker(args)
        fs.widget:connect_signal('mouse::leave', function () fs.hide() end)
     end
 
-    helpers.newtimer(partition, timeout, update)
+    helpers.newtimer(partition, timeout, fs.update)
 
-    return setmetatable(fs, { __index = fs.widget })
+    return fs
 end
 
 return setmetatable(fs, { __call = function(_, ...) return worker(...) end })