X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/669112020d022b3b9cb023c82230e21d36aa88cf..96d23431f249efc4103b2a9d6e8e98775ce2d917:/widgets/imap.lua
diff --git a/widgets/imap.lua b/widgets/imap.lua
index 6574276..3a6da8d 100644
--- a/widgets/imap.lua
+++ b/widgets/imap.lua
@@ -7,21 +7,22 @@
--]]
local helpers = require("lain.helpers")
+local async = require("lain.asyncshell")
local naughty = require("naughty")
local wibox = require("wibox")
-local io = { popen = io.popen }
local string = { format = string.format,
gsub = string.gsub }
+local tonumber = tonumber
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
@@ -33,7 +34,7 @@ local function worker(args)
local is_plain = args.is_plain or false
local settings = args.settings or function() end
- local head_command = "curl --connect-timeout 1 -fsm 3"
+ local head_command = "curl --connect-timeout 3 -fsm 3"
local request = "-X 'SEARCH (UNSEEN)'"
helpers.set_map(mail, 0)
@@ -41,7 +42,7 @@ local function worker(args)
if not is_plain
then
local f = io.popen(password)
- password = f:read("*all"):gsub("\n", "")
+ password = f:read("*a"):gsub("\n", "")
f:close()
end
@@ -52,35 +53,42 @@ local function worker(args)
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)
- f = io.popen(curl)
- ws = f:read("*all")
- f:close()
-
- t, mailcount = string.gsub(ws, "%d", "")
- t = nil -- because it's useless
-
- widget = imap.widget
- settings()
-
- if mailcount > helpers.get_map(mail) and mailcount >= 1
- then
- if mailcount == 1 then
- nt = mail .. " has one new message"
- else
- nt = mail .. " has " .. mailcount .. " new messages"
+ async.request(curl, function(f)
+ ws = f:read("*a")
+ f:close()
+
+ _, mailcount = string.gsub(ws, "%d+", "")
+ _ = nil
+
+ widget = imap.widget
+ settings()
+
+ 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
+ })
end
- naughty.notify({ preset = mail_notification_preset, text = nt })
- end
- helpers.set_map(mail, mailcount)
+ helpers.set_map(mail, mailcount)
+ end)
+
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 })