X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/4bde4b5eea6ad1352078228c0d146f41b4c893e4..c87a7be2ed35b95b254509dc3b107700b82b1ec3:/widgets/fs.lua?ds=sidebyside diff --git a/widgets/fs.lua b/widgets/fs.lua index 17037c4..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 } @@ -40,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, text = ws, - timeout = t_out + timeout = t_out, }) end --- Units definitions +-- Unit definitions local unit = { ["mb"] = 1024, ["gb"] = 1024^2 } local function worker(args) @@ -64,9 +64,9 @@ local function worker(args) 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]+)") @@ -83,24 +83,22 @@ local function worker(args) f:close() - -- chosen partition easy stuff - -- you can however check whatever partition else - used = tonumber(fs_info[partition .. " used_p"]) - available = tonumber(fs_info[partition .. " avail_p"]) - size_mb = tonumber(fs_info[partition .. " size_mb"]) - size_gb = tonumber(fs_info[partition .. " size_gb"]) + 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() - 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