X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/0b4193199b244e4f0aa365762314c0462a318014..87a32771d6f16b190d268338c265aa5c53e8856d:/widgets/imap.lua

diff --git a/widgets/imap.lua b/widgets/imap.lua
index 60a5509..95d35fd 100644
--- a/widgets/imap.lua
+++ b/widgets/imap.lua
@@ -7,22 +7,19 @@
 --]]
 
 local helpers      = require("lain.helpers")
-
-local shell        = require("awful.util").shell
 local naughty      = require("naughty")
 local wibox        = require("wibox")
-
 local string       = { format = string.format,
                        gsub   = string.gsub }
+local type         = type
 local tonumber     = tonumber
-
 local setmetatable = setmetatable
 
 -- Mail IMAP check
 -- lain.widgets.imap
 
-local function worker(args                           )
-    local imap      = helpers.make_widget_textbox()
+local function worker(args)
+    local imap      = { widget = wibox.widget.textbox() }
     local args      = args or {}
     local server    = args.server
     local mail      = args.mail
@@ -36,12 +33,16 @@ local function worker(args                           )
     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
-        helpers.async(string.format("%s -s '%s'", shell, password), function(f)
-            password = f:gsub("\n", "")
-        end)
+        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
 
     function update()
@@ -54,11 +55,12 @@ local function worker(args                           )
             mail_notification_preset.screen = awful.screen.focused()
         end
 
-        curl = string.format("%s -c '%s --url imaps://%s:%s/INBOX -u %s:%q %s -k'",
-               shell, head_command, server, port, mail, password, request)
+        curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%q %s -k",
+               head_command, server, port, mail, password, request)
 
         helpers.async(curl, function(f)
             _, mailcount = string.gsub(f, "%d+", "")
+            _ = nil
 
             widget = imap.widget
             settings()
@@ -77,9 +79,9 @@ local function worker(args                           )
 
     end
 
-    helpers.newtimer(mail, timeout, update)
+    imap.timer = helpers.newtimer(mail, timeout, update, true, true)
 
-    return setmetatable(imap, { __index = imap.widget })
+    return imap
 end
 
 return setmetatable({}, { __call = function(_, ...) return worker(...) end })