X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/f7aa28919588d307083b4b5b1c010f26cbc63cde..b9e2596cbddd1d932aa4b6bbd2226a6016b1004e:/widgets/imap.lua?ds=inline diff --git a/widgets/imap.lua b/widgets/imap.lua index 605c1c4..c404032 100644 --- a/widgets/imap.lua +++ b/widgets/imap.lua @@ -20,9 +20,9 @@ local setmetatable = setmetatable -- Mail IMAP check -- lain.widgets.imap -local imap = {} local function worker(args) + local imap = {} local args = args or {} local server = args.server @@ -61,28 +61,31 @@ local function worker(args) ws = f:read("*all") f:close() - t, mailcount = string.gsub(ws, "%d", "") - t = nil -- because it's useless - mailcount = tonumber(mailcount) + _, mailcount = string.gsub(ws, "%d+", "") + _ = nil widget = imap.widget settings() - if mailcount > helpers.get_map(mail) and mailcount >= 1 + 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 }) + naughty.notify({ + preset = mail_notification_preset, + text = nt, + screen = client.focus and client.focus.screen or 1 + }) end helpers.set_map(mail, mailcount) end helpers.newtimer(mail, timeout, update, true) - return imap.widget + return setmetatable(imap, { __index = imap.widget }) end -return setmetatable(imap, { __call = function(_, ...) return worker(...) end }) +return setmetatable({}, { __call = function(_, ...) return worker(...) end })