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

quake: client maximized before awesome restart: after the restart, unmaximize and...
[etc/awesome.git] / widgets / fs.lua
index 283771f422a139593f866d4e477b35eaf8340188..b48fcd02506baf6aa6339bffa86aa0f3da279ad3 100644 (file)
@@ -1,22 +1,20 @@
 
 --[[
-                                                      
-     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 markup       = require("lain.util.markup")
 local helpers      = require("lain.helpers")
 
+local shell        = require("awful.util").shell
 local beautiful    = require("beautiful")
+local focused      = require("awful.screen").focused
 local wibox        = require("wibox")
 local naughty      = require("naughty")
 
-local io           = io
-local string       = { match = string.match }
+local string       = string
 local tonumber     = tonumber
 
 local setmetatable = setmetatable
@@ -24,111 +22,106 @@ local setmetatable = setmetatable
 -- File system disk space usage
 -- lain.widgets.fs
 local fs = {}
-local notification = nil
 
-function fs:hide()
-    if notification ~= nil then
-        naughty.destroy(notification)
-        notification = nil
-    end
+-- Unit definitions
+fs.unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
+
+function fs.hide()
+    if not fs.notification then return end
+    naughty.destroy(fs.notification)
+    fs.notification = nil
 end
 
-function fs:show(t_out)
-    fs:hide()
+function fs.show(seconds, scr)
+    fs.hide()
 
-    local f = io.popen(helpers.scripts_dir .. "dfs")
-    ws = f:read("*all"):gsub("\n*$", "")
-    f:close()
+    if fs.followtag then
+        fs.notification_preset.screen = focused()
+    elseif scr then
+        fs.notification_preset.screen = scr
+    end
 
-    notification = naughty.notify({
-        text = ws,
-       timeout = t_out,
-        fg = fs.color,
-    })
-end
+    local cmd = (fs.options and string.format("dfs %s", fs.options)) or "dfs"
 
--- Variable 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 {}
-    local partition = args.partition or "/"
-    local refresh_timeout = args.refresh_timeout or 600
-    local header = args.header or " Hdd "
-    local header_color = args.header_color or beautiful.fg_normal or "#FFFFFF"
-    fs.color = args.color or beautiful.fg_focus or "#FFFFFF"
-    local footer = args.footer or ""
-    local shadow = args.shadow or false
-
-    local myfs = wibox.widget.textbox()
-
-    helpers.set_map("fs", false)
-
-    local fsupdate = function()
-        local fs_info = {} -- Get data from df
-        local f = io.popen("LC_ALL=C df -kP")
-
-        local function set_text()
-            local info = fs_info['{' .. partition .. ' used_p}']
-            myfs:set_markup(markup(header_color, header)
-                            .. markup(fs.color, info .. footer))
-        end
-
-        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
-                helpers.uformat(fs_info, m .. " used",  u, unit)
-                fs_info["{" .. m .. " used_p}"]  = tonumber(p)
+    local args             = args or {}
+    local timeout          = args.timeout or 600
+    local partition        = args.partition or "/"
+    local showpopup        = args.showpopup or "on"
+    local notify           = args.notify or "on"
+    local settings         = args.settings or function() end
+
+    fs.options             = args.options
+    fs.followtag           = args.followtag or false
+    fs.notification_preset = args.notification_preset or { fg = beautiful.fg_normal }
+
+    fs.widget = wibox.widget.textbox()
+
+    helpers.set_map(partition, false)
+
+
+    function 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)
+            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
-        end
-
-        f:close()
-
-        if shadow
-        then
-            myfs:set_text('')
-        else
-            set_text()
-        end
-
-        local part = fs_info['{' .. partition .. ' used_p}']
-
-        if part >= 90  then
-            if part >= 99 and not helpers.get_map("fs") then
-                naughty.notify({ title = "warning",
-                                 text = partition .. " ran out!\n"
-                                        .. "make some room",
-                                 timeout = 8,
-                                 position = "top_right",
-                                 fg = beautiful.fg_urgent,
-                                 bg = beautiful.bg_urgent })
-                helpers.set_map("fs", true)
+
+            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
-            if shadow then set_text() end
-        end
+        end)
     end
 
-    local fstimer = timer({ timeout = refresh_timeout })
-    fstimer:connect_signal("timeout", fsupdate)
-    fstimer:start()
-    fstimer:emit_signal("timeout")
-
-    myfs:connect_signal('mouse::enter', function () fs:show(0) end)
-    myfs:connect_signal('mouse::leave', function () fs:hide() 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)
+    end
 
-    local fs_out =
-    {
-        widget = myfs,
-        show = function(t_out)
-                   fsupdate()
-                   fs:show(t_out)
-               end
-    }
+    helpers.newtimer(partition, timeout, update)
 
-    return setmetatable(fs_out, { __index = fs_out.widget })
+    return setmetatable(fs, { __index = fs.widget })
 end
 
 return setmetatable(fs, { __call = function(_, ...) return worker(...) end })