awesomewm-mirrors
/
lain
mirror of https://github.com/lcpz/lain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fs: asynchronous

This commit is contained in:
copycat-killer 2017-01-21 00:09:54 +01:00
parent 0279482eeb
commit 4148ccdfcd
3 changed files with 69 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
widgets/fs.lua
View File

@ -1,24 +1,20 @@
--[[ --[[
Licensed under GNU General Public License v2 Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham * (c) 2013, Luke Bonham
* (c) 2010, Adrian C. <anrxc@sysphere.org>
* (c) 2009, Lucas de Vries <lucas@glacicle.com>
--]] --]]
local helpers = require("lain.helpers") local helpers = require("lain.helpers")
local shell = require("awful.util").shell
local beautiful = require("beautiful") local beautiful = require("beautiful")
local focused = require("awful.screen").focused local focused = require("awful.screen").focused
local wibox = require("wibox") local wibox = require("wibox")
local naughty = require("naughty") local naughty = require("naughty")
local io = { popen = io.popen } local string = string
local pairs = pairs
local string = { match = string.match,
format = string.format }
local tonumber = tonumber local tonumber = tonumber
local setmetatable = setmetatable local setmetatable = setmetatable
@ -26,14 +22,11 @@ local setmetatable = setmetatable
-- File system disk space usage -- File system disk space usage
-- lain.widgets.fs -- lain.widgets.fs
local fs = {} local fs = {}
local fs_notification = nil
function fs.hide() -- Unit definitions
if fs_notification ~= nil then fs.unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
naughty.destroy(fs_notification)
fs_notification = nil function fs.hide() naughty.destroy(fs.notification) end
end
end
function fs.show(seconds, scr) function fs.show(seconds, scr)
fs.hide() fs.hide()
@ -47,16 +40,13 @@ function fs.show(seconds, scr)
fs.notification_preset.screen = scr fs.notification_preset.screen = scr
end end
fs_notification = naughty.notify({ fs.notification = naughty.notify({
preset = fs.notification_preset, preset = fs.notification_preset,
text = ws, text = ws,
timeout = seconds or 5 timeout = seconds or 5,
}) })
end end
-- Unit definitions
local unit = { ["mb"] = 1024, ["gb"] = 1024^2 }
local function worker(args) local function worker(args)
local args = args or {} local args = args or {}
local timeout = args.timeout or 600 local timeout = args.timeout or 600
@ -69,56 +59,54 @@ local function worker(args)
fs.followtag = args.followtag or false fs.followtag = args.followtag or false
fs.notification_preset = args.notification_preset or { fg = beautiful.fg_normal } fs.notification_preset = args.notification_preset or { fg = beautiful.fg_normal }
fs.widget = wibox.widget.textbox('') fs.widget = wibox.widget.textbox()
helpers.set_map(partition, false) helpers.set_map(partition, false)
function update() function update()
fs_info = {} fs_info, fs_now = {}, {}
fs_now = {} helpers.async(string.format("%s -c 'LC_ALL=C df -k --output=target,size,used,avail,pcent'", shell), function(f)
local f = assert(io.popen("LC_ALL=C df -kP")) 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
for line in f:lines() do -- Match: (size) (used)(avail)(use%) (mount) fs_info[m .. " size_mb"] = string.format("%.1f", tonumber(s) / fs.unit["mb"])
local s = string.match(line, "^.-[%s]([%d]+)") fs_info[m .. " size_gb"] = string.format("%.1f", tonumber(s) / fs.unit["gb"])
local u,a,p = string.match(line, "([%d]+)[%D]+([%d]+)[%D]+([%d]+)%%") fs_info[m .. " used_mb"] = string.format("%.1f", tonumber(u) / fs.unit["mb"])
local m = string.match(line, "%%[%s]([%p%w]+)") fs_info[m .. " used_gb"] = string.format("%.1f", tonumber(u) / fs.unit["gb"])
fs_info[m .. " used_p"] = p
if u and m then -- Handle 1st line and broken regexp fs_info[m .. " avail_mb"] = string.format("%.1f", tonumber(a) / fs.unit["mb"])
fs_info[m .. " size_mb"] = string.format("%.1f", tonumber(s) / unit["mb"]) fs_info[m .. " avail_gb"] = string.format("%.1f", tonumber(a) / fs.unit["gb"])
fs_info[m .. " size_gb"] = string.format("%.1f", tonumber(s) / unit["gb"]) fs_info[m .. " avail_p"] = string.format("%d", 100 - tonumber(p))
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 end
end
f:close() 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"
fs_now.available = tonumber(fs_info[partition .. " avail_p"]) or 0 notification_preset = fs.notification_preset
fs_now.size_mb = tonumber(fs_info[partition .. " size_mb"]) or 0 widget = fs.widget
fs_now.size_gb = tonumber(fs_info[partition .. " size_gb"]) or 0 settings()
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 if notify == "on" and fs_now.used >= 99 and not helpers.get_map(partition) then
widget = fs.widget naughty.notify({
settings() title = "warning",
text = partition .. " is empty!",
if notify == "on" and fs_now.used >= 99 and not helpers.get_map(partition) timeout = 8,
then fg = "#000000",
naughty.notify({ bg = "#FFFFFF"
title = "warning", })
text = partition .. " ran out!\nmake some room", helpers.set_map(partition, true)
timeout = 8, else
fg = "#000000", helpers.set_map(partition, false)
bg = "#FFFFFF", end
}) end)
helpers.set_map(partition, true)
else
helpers.set_map(partition, false)
end
end end
if showpopup == "on" then if showpopup == "on" then

37
widgets/maildir.lua
View File

@ -7,24 +7,18 @@
--]] --]]
local spawn = require("awful").spawn local awful = require("awful")
local wibox = require("wibox") local wibox = require("wibox")
local helpers = require("lain.helpers")
local element_in_table = require("lain.helpers").element_in_table local io = { popen = io.popen }
local newtimer = require("lain.helpers").newtimer local os = { getenv = os.getenv }
local read_pipe = require("lain.helpers").read_pipe local string = { format = string.format,
local spairs = require("lain.helpers").spairs match = string.match }
local io = { popen = io.popen } local setmetatable = setmetatable
local os = { getenv = os.getenv }
local pairs = pairs
local string = { format = string.format,
len = string.len,
match = string.match }
local setmetatable = setmetatable -- Maildir check (synchronous)
-- Maildir check
-- lain.widgets.maildir -- lain.widgets.maildir
local maildir = {} local maildir = {}
@ -36,7 +30,7 @@ local function worker(args)
local settings = args.settings or function() end local settings = args.settings or function() end
local ext_mail_cmd = args.external_mail_cmd local ext_mail_cmd = args.external_mail_cmd
maildir.widget = wibox.widget.textbox('') maildir.widget = wibox.widget.textbox()
function update() function update()
if ext_mail_cmd then awful.spawn(ext_mail_cmd) end if ext_mail_cmd then awful.spawn(ext_mail_cmd) end
@ -52,11 +46,11 @@ local function worker(args)
-- match files that begin with a dot. -- match files that begin with a dot.
-- Afterwards the length of this string is the number of -- Afterwards the length of this string is the number of
-- new mails in that box. -- new mails in that box.
local mailstring = read_pipe(string.format("find %s /new -mindepth 1 -type f -not -name '.*' -printf a", line)) local mailstring = helpers.read_pipe(string.format("find %s /new -mindepth 1 -type f -not -name '.*' -printf a", line))
-- Strip off leading mailpath. -- Strip off leading mailpath.
local box = string.match(line, mailpath .. "/(.*)") local box = string.match(line, mailpath .. "/(.*)")
local nummails = string.len(mailstring) local nummails = #mailstring
if nummails > 0 then if nummails > 0 then
boxes[box] = nummails boxes[box] = nummails
@ -68,9 +62,9 @@ local function worker(args)
local newmail = "no mail" local newmail = "no mail"
local total = 0 local total = 0
for box, number in spairs(boxes) do for box, number in helpers.spairs(boxes) do
-- Add this box only if it's not to be ignored. -- Add this box only if it's not to be ignored.
if not util.element_in_table(box, ignore_boxes) then if not helpers.element_in_table(box, ignore_boxes) then
total = total + number total = total + number
if newmail == "no mail" then if newmail == "no mail" then
newmail = string.format("%s(%s)", box, number) newmail = string.format("%s(%s)", box, number)
@ -81,11 +75,10 @@ local function worker(args)
end end
widget = maildir.widget widget = maildir.widget
settings() settings()
end end
newtimer(mailpath, timeout, update, true) helpers.newtimer(mailpath, timeout, update, true)
return setmetatable(maildir, { __index = maildir.widget }) return setmetatable(maildir, { __index = maildir.widget })
end end

2
wiki

@ -1 +1 @@
Subproject commit fd369119050a6674c7bb4ef3b2b1d6c6dbdecb83 Subproject commit 3e321046961aed74ac3cbc02ace4d61b11a29ad1