X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/eb8cec907a50f3fd6df4b14ae10b910444017f92..2242f42c8faec1b24a01dcf29f4b5078612e67eb:/widgets/imap.lua diff --git a/widgets/imap.lua b/widgets/imap.lua index 2c7067c..95d35fd 100644 --- a/widgets/imap.lua +++ b/widgets/imap.lua @@ -7,125 +7,81 @@ --]] local helpers = require("lain.helpers") - local naughty = require("naughty") local wibox = require("wibox") - -local io = { popen = io.popen } +local string = { format = string.format, + gsub = string.gsub } +local type = type local tonumber = tonumber -local string = { len = string.len, - format = string.format } - local setmetatable = setmetatable -- Mail IMAP check -- lain.widgets.imap -local imap = { stored = nil } - -function worker(args) - 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 encoding = args.encoding or nil - local maxlen = args.maxlen or 200 - local is_plain = args.is_plain or false - local settings = args.settings or function() end - - local checkmail = helpers.scripts_dir .. "checkmail" - - helpers.set_map(mail, true) - helpers.set_map(mail .. " count", "0") - - if not is_plain - then - if not imap.stored - then - local f = io.popen(password) - password = f:read("*all"):gsub("\n", ""):gsub("\r", "") - f:close() - imap.stored = password - else - password = imap.stored + +local function worker(args) + 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 + 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 - widget = wibox.widget.textbox('') - function update() - to_execute = string.format("%s -s %s -u %s -p %s --port %s", - checkmail, server, mail, password, port) - - if encoding ~= nil - then - to_execute = string.format("%s --encoding %s", - to_execute, encoding) - end - - f = io.popen(to_execute) - ws = f:read("*all") - f:close() - - mailcount = "0" - - if ws:find("No new messages") ~= nil - then - helpers.set_map(mail, true) - elseif ws:find("CheckMailError: invalid credentials") ~= nil - then - helpers.set_map(mail, true) - mailcount = "invalid credentials" - else - mailcount = ws:match("%d") or "0" - if helpers.get_map(mail .. " count") ~= mailcount and mailcount ~= "0" - then - helpers.set_map(mail, true) - helpers.set_map(mail .. " count", mailcount) - end - end - - notification_preset = { + mail_notification_preset = { icon = helpers.icons_dir .. "mail.png", - timeout = 8, position = "top_left" } - settings() + if followtag then + mail_notification_preset.screen = awful.screen.focused() + end + curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%q %s -k", + head_command, server, port, mail, password, request) - if helpers.get_map(mail) and tonumber(mailcount) >= 1 - then - notify_title = ws:match(mail .. " has %d new message.?") - ws = ws:gsub(notify_title, "", 1):gsub("\n", "", 2) + helpers.async(curl, function(f) + _, mailcount = string.gsub(f, "%d+", "") + _ = nil - -- trying to remove useless infos - ws = ws:gsub("--Content.%S+.-\n", "") - ws = ws:gsub("--%d+.-\n", "") + widget = imap.widget + settings() - if string.len(ws) > maxlen - then - ws = ws:sub(1, maxlen) .. "[...]" + 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 }) end - notify_title = notify_title:gsub("\n", "") - - naughty.notify({ - preset = notification_preset, - title = notify_title, - text = ws - }) + helpers.set_map(mail, mailcount) + end) - helpers.set_map(mail, false) - end end - helpers.newtimer(mail, timeout, update, true) + imap.timer = helpers.newtimer(mail, timeout, update, true, true) - return widget + return imap end -return setmetatable(imap, { __call = function(_, ...) return worker(...) end }) +return setmetatable({}, { __call = function(_, ...) return worker(...) end })