mem: adjusted calculation; #271

[etc/awesome.git] / widgets / imap.lua

diff --git a/widgets/imap.lua b/widgets/imap.lua
index 3caf31a6f647518f276183ebdd740f34fb676fe8..5896ae11b764fa639628769ba63356511895c9ac 100644 (file)
--- a/widgets/imap.lua
+++ b/widgets/imap.lua
@@ -7,44 +7,39 @@
 --]]
 
 local helpers      = require("lain.helpers")
-
 local naughty      = require("naughty")
 local wibox        = require("wibox")
-
 local string       = { format = string.format,
                        gsub   = string.gsub }
 local tonumber     = tonumber
-
 local setmetatable = setmetatable
 
 -- Mail IMAP check
 -- lain.widgets.imap
 
-local function worker(args)
-    local imap        = {}
-    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 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
-        password = helpers.read_pipe(password):gsub("\n", "")
+        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",
@@ -60,6 +55,7 @@ local function worker(args)
 
         helpers.async(curl, function(f)
             _, mailcount = string.gsub(f, "%d+", "")
+            _ = nil
 
             widget = imap.widget
             settings()
@@ -78,7 +74,7 @@ local function worker(args)
 
     end
 
-    helpers.newtimer(mail, timeout, update, true)
+    imap.timer = helpers.newtimer(mail, timeout, update, true, true)
 
     return setmetatable(imap, { __index = imap.widget })
 end