X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/4060898f1b9d8ae2d3adee0dd28ebf601631c975..ea4e4f41b35b37fc6b529c625d956c11d108a403:/widgets/imap.lua

diff --git a/widgets/imap.lua b/widgets/imap.lua
index b3f281d..5896ae1 100644
--- a/widgets/imap.lua
+++ b/widgets/imap.lua
@@ -7,82 +7,76 @@
 --]]
 
 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 tonumber     = tonumber
-
 local setmetatable = setmetatable
 
 -- Mail IMAP check
 -- lain.widgets.imap
-local imap = {}
-
-local 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 is_plain = args.is_plain or false
-    local settings = args.settings or function() end
-
-    local head_command  = "curl --connect-timeout 1 -fsm 3"
+local function worker(args                           )
+    local imap      = helpers.make_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("*all"):gsub("\n", "")
-        f:close()
+    if not is_plain then
+        helpers.async(password, function(f) password = f:gsub("\n", "") 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
 
-        f = io.popen(curl)
-        ws = f:read("*all")
-        f:close()
+        curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%q %s -k",
+               head_command, server, port, mail, password, request)
 
-        t, mailcount = string.gsub(ws, "%d", "")
-        t = nil 
-        mailcount = tonumber(mailcount)
+        helpers.async(curl, function(f)
+            _, mailcount = string.gsub(f, "%d+", "")
+            _ = nil
 
-        widget = imap.widget
-        settings()
+            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 <b>" .. mailcount .. "</b> new messages"
+            if mailcount >= 1 and mailcount > helpers.get_map(mail) then
+                if mailcount == 1 then
+                    nt = mail .. " has one new message"
+                else
+                    nt = mail .. " has <b>" .. mailcount .. "</b> 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
+    imap.timer = helpers.newtimer(mail, timeout, update, true, true)
+
+    return setmetatable(imap, { __index = imap.widget })
 end
 
-return setmetatable(imap, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })