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

alsa{bar}: add togglechannel back
[etc/awesome.git] / widgets / fs.lua
index ad5b204e48d0e2c8ffb00dae2e627443461d9f0a..391c26009ed3e9960d16bb9ca5e25895330bd486 100644 (file)
@@ -1,24 +1,19 @@
 
 --[[
-                                                      
-     Licensed under GNU General Public License v2     
-      * (c) 2013, Luke Bonham                         
-      * (c) 2010, Adrian C.      <anrxc@sysphere.org> 
-      * (c) 2009, Lucas de Vries <lucas@glacicle.com> 
-                                                      
+                                                  
+     Licensed under GNU General Public License v2 
+      * (c) 2013, Luke Bonham                     
+                                                  
 --]]
 
 local helpers      = require("lain.helpers")
 
-local beautiful    = require("beautiful")
+local shell        = require("awful.util").shell
+local focused      = require("awful.screen").focused
 local wibox        = require("wibox")
 local naughty      = require("naughty")
 
-local io           = { popen  = io.popen }
-local pairs        = pairs
-local mouse        = mouse
-local string       = { match  = string.match,
-                       format = string.format }
+local string       = string
 local tonumber     = tonumber
 
 local setmetatable = setmetatable
@@ -26,34 +21,35 @@ local setmetatable = setmetatable
 -- File system disk space usage
 -- lain.widgets.fs
 local fs = {}
-local fs_notification  = nil
+
+-- Unit definitions
+fs.unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
 
 function fs.hide()
-    if fs_notification ~= nil then
-        naughty.destroy(fs_notification)
-        fs_notification = nil
-    end
+    if not fs.notification then return end
+    naughty.destroy(fs.notification)
+    fs.notification = nil
 end
 
-function fs.show(t_out, fs_args)
+function fs.show(seconds, scr)
     fs.hide()
 
-    local cmd = (fs_args and string.format("dfs %s", fs_args)) or "dfs"
-    local ws = helpers.read_pipe(helpers.scripts_dir .. cmd):gsub("\n*$", "")
-
-    if fs.followmouse then
-        fs.notification_preset.screen = mouse.screen
+    if fs.followtag then
+        fs.notification_preset.screen = focused()
+    elseif scr then
+        fs.notification_preset.screen = scr
     end
 
-    fs_notification = naughty.notify({
-        preset  = fs.notification_preset,
-        text    = ws,
-        timeout = t_out
-    })
-end
+    local cmd = (fs.options and string.format("dfs %s", fs.options)) or "dfs"
 
--- Unit definitions
-local unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
+    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)
+end
 
 local function worker(args)
     local args             = args or {}
@@ -63,60 +59,70 @@ local function worker(args)
     local notify           = args.notify or "on"
     local settings         = args.settings or function() end
 
-    fs.followmouse         = args.followmouse or false
-    fs.notification_preset = args.notification_preset or { fg = beautiful.fg_normal }
+    fs.options             = args.options
+    fs.followtag           = args.followtag or false
+    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"
+    end
 
-    fs.widget = wibox.widget.textbox('')
+    fs.widget = wibox.widget.textbox()
 
     helpers.set_map(partition, false)
 
+
     function update()
-        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]+)")
-            local u,a,p = string.match(line, "([%d]+)[%D]+([%d]+)[%D]+([%d]+)%%")
-            local m     = string.match(line, "%%[%s]([%p%w]+)")
-
-            if u and m then -- Handle 1st line and broken regexp
-                fs_info[m .. " size_mb"]  = string.format("%.1f", tonumber(s) / unit["mb"])
-                fs_info[m .. " size_gb"]  = string.format("%.1f", tonumber(s) / unit["gb"])
-                fs_info[m .. " used_p"]   = tonumber(p)
-                fs_info[m .. " avail_p"]  = 100 - tonumber(p)
+        fs_info, fs_now  = {}, {}
+        helpers.async(string.format("%s -c 'LC_ALL=C df -k --output=target,size,used,avail,pcent'", shell), 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
+
+                fs_info[m .. " size_mb"]  = string.format("%.1f", tonumber(s) / fs.unit["mb"])
+                fs_info[m .. " size_gb"]  = string.format("%.1f", tonumber(s) / fs.unit["gb"])
+                fs_info[m .. " used_mb"]  = string.format("%.1f", tonumber(u) / fs.unit["mb"])
+                fs_info[m .. " used_gb"]  = string.format("%.1f", tonumber(u) / fs.unit["gb"])
+                fs_info[m .. " used_p"]   = p
+                fs_info[m .. " avail_mb"] = string.format("%.1f", tonumber(a) / fs.unit["mb"])
+                fs_info[m .. " avail_gb"] = string.format("%.1f", tonumber(a) / fs.unit["gb"])
+                fs_info[m .. " avail_p"]  = string.format("%d", 100 - tonumber(p))
+            end
+
+            fs_now.size_mb      = fs_info[partition .. " size_mb"]  or "N/A"
+            fs_now.size_gb      = fs_info[partition .. " size_gb"]  or "N/A"
+            fs_now.used         = fs_info[partition .. " used_p"]   or "N/A"
+            fs_now.used_mb      = fs_info[partition .. " used_mb"]  or "N/A"
+            fs_now.used_gb      = fs_info[partition .. " used_gb"]  or "N/A"
+            fs_now.available    = fs_info[partition .. " avail_p"]  or "N/A"
+            fs_now.available_mb = fs_info[partition .. " avail_mb"] or "N/A"
+            fs_now.available_gb = fs_info[partition .. " avail_gb"] or "N/A"
+
+            notification_preset = fs.notification_preset
+            widget = fs.widget
+            settings()
+
+            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"
+                })
+                helpers.set_map(partition, true)
+            else
+                helpers.set_map(partition, false)
             end
-        end
-
-        f:close()
-
-        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
-
-        notification_preset = fs.notification_preset
-        widget = fs.widget
-        settings()
-
-        if notify == "on" and 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",
-                bg = "#FFFFFF",
-            })
-            helpers.set_map(partition, true)
-        else
-            helpers.set_map(partition, false)
-        end
+        end)
     end
 
     if showpopup == "on" then
-        fs.widget:connect_signal('mouse::enter', function () fs:show(0) end)
-        fs.widget:connect_signal('mouse::leave', function () fs:hide() end)
+       fs.widget:connect_signal('mouse::enter', function () fs.show(0) end)
+       fs.widget:connect_signal('mouse::leave', function () fs.hide() end)
     end
 
     helpers.newtimer(partition, timeout, update)