X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/6cc550655fad64e784ff87916f3ef439ebaf4c4a..dd19cbc77a15510b4bf9101feddf3b10968d9cf1:/widgets/imap.lua
diff --git a/widgets/imap.lua b/widgets/imap.lua
index 39518bd..ea763df 100644
--- a/widgets/imap.lua
+++ b/widgets/imap.lua
@@ -7,11 +7,12 @@
--]]
local helpers = require("lain.helpers")
+local async = require("lain.asyncshell")
local naughty = require("naughty")
local wibox = require("wibox")
-local io = { popen = io.popen }
+local mouse = mouse
local string = { format = string.format,
gsub = string.gsub }
local tonumber = tonumber
@@ -20,30 +21,29 @@ local setmetatable = setmetatable
-- Mail IMAP check
-- lain.widgets.imap
-local imap = {}
local function worker(args)
- local args = args or {}
+ local imap = {}
+ local args = args or {}
- local server = args.server
- local mail = args.mail
- local password = args.password
+ 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 port = args.port or 993
+ local timeout = args.timeout or 60
+ local is_plain = args.is_plain or false
+ local followmouse = args.followmouse 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)
if not is_plain
then
- local f = io.popen(password)
- password = f:read("*all"):gsub("\n", "")
- f:close()
+ password = helpers.read_pipe(password):gsub("\n", "")
end
imap.widget = wibox.widget.textbox('')
@@ -54,34 +54,41 @@ local function worker(args)
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()
-
- _, mailcount = string.gsub(ws, "%d+", "")
- _ = nil
+ if followmouse then
+ mail_notification_preset.screen = mouse.screen
+ end
- widget = imap.widget
- settings()
+ curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%q %s -k",
+ head_command, server, port, mail, password, request)
- 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)
+ _, mailcount = string.gsub(f, "%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
+ })
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 })