#199 #203 fix attempt 3

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

diff --git a/widgets/imap.lua b/widgets/imap.lua
index 1dca87cddfc856c8350243e1fbbabcc741b50233..ea763dfa4127ff4baf1cdbd642b7abf61f789a1b 100644 (file)
--- a/widgets/imap.lua
+++ b/widgets/imap.lua
@@ -12,6 +12,7 @@ local async        = require("lain.asyncshell")
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 

+local mouse        = mouse

 local string       = { format = string.format,
                        gsub   = string.gsub }
 local tonumber     = tonumber
 local string       = { format = string.format,
                        gsub   = string.gsub }
 local tonumber     = tonumber


@@ -22,28 +23,27 @@ local setmetatable = setmetatable
 -- lain.widgets.imap
 
 local function worker(args)
 -- lain.widgets.imap
 
 local function worker(args)

-    local imap     = {}
-    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 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()
+        password = helpers.read_pipe(password):gsub("\n", "")

     end
 
     imap.widget = wibox.widget.textbox('')
     end
 
     imap.widget = wibox.widget.textbox('')


@@ -54,14 +54,15 @@ local function worker(args)
             position = "top_left"
         }
 
             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 followmouse then
+            mail_notification_preset.screen = mouse.screen
+        end

 
 

-        async.request(curl, function(f) 
-            ws = f:read("*a")
-            f:close()
+        curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%q %s -k",
+               head_command, server, port, mail, password, request)

 
 

-            _, mailcount = string.gsub(ws, "%d+", "")
+        async.request(curl, function(f)
+            _, mailcount = string.gsub(f, "%d+", "")

             _ = nil
 
             widget = imap.widget
             _ = nil
 
             widget = imap.widget


@@ -76,8 +77,7 @@ local function worker(args)
                 end
                 naughty.notify({
                     preset = mail_notification_preset,
                 end
                 naughty.notify({
                     preset = mail_notification_preset,

-                    text = nt,
-                    screen = client.focus and client.focus.screen or 1
+                    text = nt

                 })
             end
 
                 })
             end