fs/alsabar: small fixes

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

diff --git a/widgets/imap.lua b/widgets/imap.lua
index 1dca87cddfc856c8350243e1fbbabcc741b50233..60a55090bbd79597c7d6dab22b5e475921b585e6 100644 (file)
--- a/widgets/imap.lua
+++ b/widgets/imap.lua
@@ -7,8 +7,8 @@
 --]]
 
 local helpers      = require("lain.helpers")
-local async        = require("lain.asyncshell")
 
+local shell        = require("awful.util").shell
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
@@ -21,64 +21,55 @@ 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 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)'"
 
     helpers.set_map(mail, 0)
 
-    if not is_plain
-    then
-        local f = io.popen(password)
-        password = f:read("*a"):gsub("\n", "")
-        f:close()
+    if not is_plain then
+        helpers.async(string.format("%s -s '%s'", shell, 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
 
-        async.request(curl, function(f) 
-            ws = f:read("*a")
-            f:close()
+        curl = string.format("%s -c '%s --url imaps://%s:%s/INBOX -u %s:%q %s -k'",
+               shell, head_command, server, port, mail, password, request)
 
-            _, mailcount = string.gsub(ws, "%d+", "")
-            _ = nil
+        helpers.async(curl, function(f)
+            _, mailcount = string.gsub(f, "%d+", "")
 
             widget = imap.widget
             settings()
 
-            if mailcount >= 1 and mailcount > helpers.get_map(mail)
-            then
+            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,
-                    screen = client.focus and client.focus.screen or 1
-                })
+                naughty.notify({ preset = mail_notification_preset, text = nt })
             end
 
             helpers.set_map(mail, mailcount)
@@ -86,7 +77,7 @@ local function worker(args)
 
     end
 
-    helpers.newtimer(mail, timeout, update, true)
+    helpers.newtimer(mail, timeout, update)
 
     return setmetatable(imap, { __index = imap.widget })
 end