--]]
-local markup = require("lain.util.markup")
local helpers = require("lain.helpers")
local beautiful = require("beautiful")
local wibox = require("wibox")
local naughty = require("naughty")
-local io = io
-local string = { match = string.match }
+local io = { popen = io.popen }
+local pairs = pairs
+local mouse = mouse
+local string = { match = string.match,
+ format = string.format }
local tonumber = tonumber
local setmetatable = setmetatable
-- File system disk space usage
-- lain.widgets.fs
local fs = {}
-local notification = nil
+
+local fs_notification = nil
function fs:hide()
- if notification ~= nil then
- naughty.destroy(notification)
- notification = nil
+ if fs_notification ~= nil then
+ naughty.destroy(fs_notification)
+ fs_notification = nil
end
end
function fs:show(t_out)
fs:hide()
- local f = io.popen(helpers.scripts_dir .. "dfs")
- ws = f:read("*all"):gsub("\n*$", "")
- f:close()
+ local ws = helpers.read_pipe(helpers.scripts_dir .. "dfs"):gsub("\n*$", "")
+
+ if fs.followmouse then
+ fs_notification_preset.screen = mouse.screen
+ end
- notification = naughty.notify({
- text = ws,
- timeout = t_out,
- fg = fs.color,
+ fs_notification = naughty.notify({
+ preset = fs_notification_preset,
+ text = ws,
+ timeout = t_out
})
end
--- Variable definitions
+-- Unit definitions
local unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
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
+ local args = args or {}
+ local timeout = args.timeout or 600
+ local partition = args.partition or "/"
+ 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.widget = wibox.widget.textbox('')
+
+ helpers.set_map(partition, false)
+ helpers.set_map("fsused", 0)
+
+ 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 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)
+ 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)
end
end
f:close()
- if shadow
- then
- myfs:set_text('')
- else
- set_text()
+ 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
+
+ if helpers.get_map("fsused") ~= fs_now.used then
+ widget = fs.widget
+ settings()
+ helpers.set_map("fsused", fs_now.used)
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)
- end
- if shadow then set_text() end
+ if 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
- 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)
+ fs.widget:connect_signal('mouse::enter', function () fs:show(0) end)
+ fs.widget:connect_signal('mouse::leave', function () fs:hide() 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 })
projects / etc / awesome.git / blobdiff