changing from awful.util.spawn_with_shell to awful.spawn.with_shell

[etc/awesome.git] / widgets / fs.lua

diff --git a/widgets/fs.lua b/widgets/fs.lua
index f9342487117ecf05b52c6085ebbfdf454019e653..f578f8bb240bfe150c354f2363e7fd5f692509a2 100644 (file)
--- a/widgets/fs.lua
+++ b/widgets/fs.lua
@@ -11,10 +11,11 @@
 local helpers      = require("lain.helpers")
 
 local beautiful    = require("beautiful")
+local focused      = require("awful.screen").focused
 local wibox        = require("wibox")
 local naughty      = require("naughty")
 
-local io           = io
+local io           = { popen  = io.popen }
 local pairs        = pairs
 local string       = { match  = string.match,
                        format = string.format }
@@ -24,47 +25,58 @@ local setmetatable = setmetatable
 
 -- File system disk space usage
 -- lain.widgets.fs
-local fs = { notification_preset = {} }
-local notification = nil
+local fs = {}
+local fs_notification  = nil
 
-function fs:hide()
-    if notification ~= nil then
-        naughty.destroy(notification)
-        notification = nil
+function fs.hide()
+    if fs_notification ~= nil then
+        naughty.destroy(fs_notification)
+        fs_notification = nil
     end
 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()
+    local cmd = (fs.options and string.format("dfs %s", fs.options)) or "dfs"
+    local ws = helpers.read_pipe(helpers.scripts_dir .. cmd):gsub("\n*$", "")
 
-    notification = naughty.notify({
-        preset = fs.notification_preset,
-        text = ws,
-       timeout = t_out
+    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 = seconds or 5
     })
 end
 
--- Units definitions
+-- Unit definitions
 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 settings  = args.settings or function() end
+    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
 
-    widget = wibox.widget.textbox('')
+    fs.options             = args.options
+    fs.followtag           = args.followtag or false
+    fs.notification_preset = args.notification_preset or { fg = beautiful.fg_normal }
 
-    helpers.set_map("fs", false)
+    fs.widget = wibox.widget.textbox('')
 
-    function update()
-        fs_info = {} 
+    helpers.set_map(partition, false)
 
-        local f = io.popen("LC_ALL=C df -kP")
+    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]+)")
@@ -74,6 +86,8 @@ local function worker(args)
             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_mb"]  = string.format("%.1f", tonumber(u) / unit["mb"])
+                fs_info[m .. " used_gb"]  = string.format("%.1f", tonumber(u) / unit["gb"])
                 fs_info[m .. " used_p"]   = tonumber(p)
                 fs_info[m .. " avail_p"]  = 100 - tonumber(p)
             end
@@ -81,48 +95,40 @@ local function worker(args)
 
         f:close()
 
-        -- 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 }
+        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
+        fs_now.used      = tonumber(fs_info[partition .. " used_p"])  or 0
+        fs_now.used_mb   = tonumber(fs_info[partition .. " used_mb"]) or 0
+        fs_now.used_gb   = tonumber(fs_info[partition .. " used_gb"]) or 0
 
+        notification_preset = fs.notification_preset
+        widget = fs.widget
         settings()
 
-        fs.notification_preset = notification_preset
-
-        if used >= 99 and not helpers.get_map("fs")
+        if notify == "on" and fs_now.used >= 99 and not helpers.get_map(partition)
         then
-            naughty.notify({ 
+            naughty.notify({
                 title = "warning",
                 text = partition .. " ran out!\nmake some room",
                 timeout = 8,
                 fg = "#000000",
-                bg = "#FFFFFF"
+                bg = "#FFFFFF",
             })
-            helpers.set_map("fs", true)
+            helpers.set_map(partition, true)
         else
-            helpers.set_map("fs", false)
+            helpers.set_map(partition, false)
         end
     end
 
-    helpers.newtimer("fs " .. partition, timeout, update)
-
-    widget:connect_signal('mouse::enter', function () fs:show(0) end)
-    widget: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
 
-    output = {
-        widget = widget,
-        show = function(t_out)
-                   update()
-                   fs:show(t_out)
-               end
-    }
+    helpers.newtimer(partition, timeout, update)
 
-    return setmetatable(output, { __index = output.widget })
+    return setmetatable(fs, { __index = fs.widget })
 end
 
 return setmetatable(fs, { __call = function(_, ...) return worker(...) end })