X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/898940858203008d7cc365dbc3156e4dde34e9eb..1400e906708e907c268a37726a2c9852c4941377:/widgets/imap.lua?ds=sidebyside diff --git a/widgets/imap.lua b/widgets/imap.lua index 3a6da8d..95d35fd 100644 --- a/widgets/imap.lua +++ b/widgets/imap.lua @@ -7,78 +7,71 @@ --]] local helpers = require("lain.helpers") -local async = require("lain.asyncshell") - local naughty = require("naughty") local wibox = require("wibox") - local string = { format = string.format, gsub = string.gsub } +local type = type local tonumber = tonumber - local setmetatable = setmetatable -- Mail IMAP check -- lain.widgets.imap local function worker(args) - local imap = {} - local args = args or {} - - local server = args.server - local mail = args.mail - local password = args.password - - local port = args.port or 993 - local timeout = args.timeout or 60 - local is_plain = args.is_plain or false - local settings = args.settings or function() end - - local head_command = "curl --connect-timeout 3 -fsm 3" + local imap = { widget = wibox.widget.textbox() } + local args = args or {} + local server = args.server + local mail = args.mail + local password = args.password + local port = args.port or 993 + local timeout = args.timeout or 60 + local is_plain = args.is_plain or false + local followtag = args.followtag or false + local settings = args.settings or function() end + + local head_command = "curl --connect-timeout 3 -fsm 3" local request = "-X 'SEARCH (UNSEEN)'" + if not server or not mail or not password then return end + helpers.set_map(mail, 0) - if not is_plain - then - local f = io.popen(password) - password = f:read("*a"):gsub("\n", "") - f:close() + if not is_plain then + if type(password) == "string" or type(password) == "table" then + helpers.async(password, function(f) password = f:gsub("\n", "") end) + elseif type(password) == "function" then + local p = password() + end end - imap.widget = wibox.widget.textbox('') - function update() mail_notification_preset = { icon = helpers.icons_dir .. "mail.png", position = "top_left" } - curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%s %s -k", - head_command, server, port, mail, password, request) + if followtag then + mail_notification_preset.screen = awful.screen.focused() + end - async.request(curl, function(f) - ws = f:read("*a") - f:close() + curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%q %s -k", + head_command, server, port, mail, password, request) - _, mailcount = string.gsub(ws, "%d+", "") + helpers.async(curl, function(f) + _, mailcount = string.gsub(f, "%d+", "") _ = nil widget = imap.widget settings() - if mailcount >= 1 and mailcount > helpers.get_map(mail) - then + if mailcount >= 1 and mailcount > helpers.get_map(mail) then if mailcount == 1 then nt = mail .. " has one new message" else nt = mail .. " has " .. mailcount .. " new messages" end - naughty.notify({ - preset = mail_notification_preset, - text = nt, - screen = client.focus and client.focus.screen or 1 - }) + naughty.notify({ preset = mail_notification_preset, text = nt }) end helpers.set_map(mail, mailcount) @@ -86,9 +79,9 @@ local function worker(args) end - helpers.newtimer(mail, timeout, update, true) + imap.timer = helpers.newtimer(mail, timeout, update, true, true) - return setmetatable(imap, { __index = imap.widget }) + return imap end return setmetatable({}, { __call = function(_, ...) return worker(...) end })