X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/701549145d89db1c1d500ff2ffcda66fe843bd30..faecd881fc44b5a045bc86f2101b89e2999d6521:/widgets/fs.lua?ds=inline diff --git a/widgets/fs.lua b/widgets/fs.lua index 3a36bf3..3b99cba 100644 --- a/widgets/fs.lua +++ b/widgets/fs.lua @@ -14,7 +14,7 @@ local beautiful = require("beautiful") 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,8 +24,10 @@ local setmetatable = setmetatable -- File system disk space usage -- lain.widgets.fs -local fs = { notification_preset = {} } -local notification = nil +local fs = {} + +local notification = nil +fs_notification_preset = { fg = beautiful.fg_normal } function fs:hide() if notification ~= nil then @@ -38,17 +40,17 @@ function fs:show(t_out) fs:hide() local f = io.popen(helpers.scripts_dir .. "dfs") - ws = f:read("*all"):gsub("\n*$", "") + ws = f:read("*a"):gsub("\n*$", "") f:close() notification = naughty.notify({ - preset = fs.notification_preset, + preset = fs_notification_preset, text = ws, - timeout = t_out + timeout = t_out, }) end --- Units definitions +-- Unit definitions local unit = { ["mb"] = 1024, ["gb"] = 1024^2 } local function worker(args) @@ -57,14 +59,14 @@ local function worker(args) local partition = args.partition or "/" local settings = args.settings or function() end - widget = wibox.widget.textbox('') + fs.widget = wibox.widget.textbox('') helpers.set_map("fs", false) function update() - fs_info = {} - - local f = io.popen("LC_ALL=C df -kP") + fs_info = {} + fs_now = {} + local f = io.popen("LC_ALL=C df -kP " .. partition) for line in f:lines() do -- Match: (size) (used)(avail)(use%) (mount) local s = string.match(line, "^.-[%s]([%d]+)") @@ -81,27 +83,22 @@ 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.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 + widget = fs.widget settings() - fs.notification_preset = notification_preset - - if used >= 99 and not helpers.get_map("fs") + if fs_now.used >= 99 and not helpers.get_map("fs") 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) else @@ -109,20 +106,12 @@ local function worker(args) end end - helpers.newtimer("fs " .. partition, timeout, update) + helpers.newtimer(partition, timeout, update) widget:connect_signal('mouse::enter', function () fs:show(0) end) widget:connect_signal('mouse::leave', function () fs:hide() end) - output = { - widget = widget, - show = function(t_out) - update() - fs:show(t_out) - end - } - - return setmetatable(output, { __index = output.widget }) + return setmetatable(fs, { __index = fs.widget }) end return setmetatable(fs, { __call = function(_, ...) return worker(...) end })