X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/5ab75a15300f5e3eda4ee444dc3702a8eecbff69..fc5974a9c2838efa8dedbd350d9623e193ab71a3:/widgets/maildir.lua diff --git a/widgets/maildir.lua b/widgets/maildir.lua index 98de091..1f4cd45 100644 --- a/widgets/maildir.lua +++ b/widgets/maildir.lua @@ -7,123 +7,78 @@ --]] -local markup = require("lain.util.markup") -local run_in_terminal = require("lain.helpers").run_in_terminal - -local awful = require("awful") -local beautiful = require("beautiful") -local wibox = require("wibox") - -local io = io -local os = { getenv = os.getenv } -local pairs = pairs -local string = { len = string.len, - match = string.match } -local table = { sort = table.sort } - -local setmetatable = setmetatable - --- Maildir check +local awful = require("awful") +local wibox = require("wibox") +local helpers = require("lain.helpers") +local io = { popen = io.popen } +local os = { getenv = os.getenv } +local string = { format = string.format, + match = string.match } +local setmetatable = setmetatable + +-- Maildir check (synchronous) -- lain.widgets.maildir local maildir = {} -function worker(args) - local args = args or {} - local mailpath = args.mailpath or os.getenv("HOME") .. "/Mail" +local function worker(args) + local args = args or {} + local timeout = args.timeout or 60 + local mailpath = args.mailpath or os.getenv("HOME") .. "/Mail" local ignore_boxes = args.ignore_boxes or {} - local refresh_timeout = args.refresh_timeout or 60 - local header = args.header or " Mail " - local header_color = args.header_color or beautiful.fg_normal or "#FFFFFF" - local color_newmail = args.color_newmail or beautiful.fg_focus or "#FFFFFF" - local color_nomail = args.color_nomail or beautiful.fg_normal or "#FFFFFF" - local app = args.app or "mutt" - local shadow = args.shadow or false + local settings = args.settings or function() end + local ext_mail_cmd = args.external_mail_cmd + + maildir.widget = wibox.widget.textbox() + + function maildir.update() + if ext_mail_cmd then awful.spawn(ext_mail_cmd) end - local mymailcheck = wibox.widget.textbox() - local mymailcheckupdate = function() -- Find pathes to mailboxes. - local p = io.popen("find " .. mailpath .. - " -mindepth 1 -maxdepth 1 -type d" .. - " -not -name .git") + local p = io.popen(string.format("find %s -mindepth 1 -maxdepth 2 -type d -not -name .git", mailpath)) local boxes = {} - local line = "" repeat line = p:read("*l") - if line ~= nil - then + if line then -- Find all files in the "new" subdirectory. For each -- file, print a single character (no newline). Don't -- match files that begin with a dot. -- Afterwards the length of this string is the number of -- new mails in that box. - local np = io.popen("find " .. line .. - "/new -mindepth 1 -type f " .. - "-not -name '.*' -printf a") - local mailstring = np:read("*all") + local mailstring = helpers.read_pipe(string.format("find %s /new -mindepth 1 -type f -not -name '.*' -printf a", line)) -- Strip off leading mailpath. - local box = string.match(line, mailpath .. "/*([^/]+)") - local nummails = string.len(mailstring) - if nummails > 0 - then + local box = string.match(line, mailpath .. "/(.*)") + local nummails = #mailstring + + if nummails > 0 then boxes[box] = nummails end end - until line == nil + until not line + p:close() - table.sort(boxes) + local newmail = "no mail" + local total = 0 - local newmail = "" - local count = 0 - for box, number in pairs(boxes) - do - count = count + 1 + for box, number in helpers.spairs(boxes) do -- Add this box only if it's not to be ignored. - if not util.element_in_table(box, ignore_boxes) - then - if newmail == "" - then - newmail = box .. "(" .. number .. ")" + if not helpers.element_in_table(box, ignore_boxes) then + total = total + number + if newmail == "no mail" then + newmail = string.format("%s(%s)", box, number) else - newmail = newmail .. ", " .. - box .. "(" .. number .. ")" + newmail = string.format("%s, %s(%s)", newmail, box, number) end end end - if count == 1 then - -- it will be only executed once - for box, number in pairs(boxes) - do -- it's useless to show only INBOX(x) - if box == "INBOX" then newmail = number end - end - end - - if newmail == "" - then - if shadow - then - mymailcheck:set_text('') - else - myimapcheck:set_markup(markup(color_nomail, " no mail ")) - end - else - myimapcheck:set_markup(" " .. markup(header_color, header) .. - markup(color_newmail, newmail) .. " ") - end + widget = maildir.widget + settings() end - local mymailchecktimer = timer({ timeout = refresh_timeout }) - mymailchecktimer:connect_signal("timeout", mymailcheckupdate) - mymailchecktimer:start() - mymailcheck:buttons(awful.util.table.join( - awful.button({}, 0, - function() - run_in_terminal(app) - end) - )) + maildir.timer = helpers.newtimer(mailpath, timeout, maildir.update, true, true) - return mymailcheck + return setmetatable(maildir, { __index = maildir.widget }) end return setmetatable(maildir, { __call = function(_, ...) return worker(...) end })