layout: fixed useless_gap retrieval

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

diff --git a/widgets/imap.lua b/widgets/imap.lua
index 6574276221e54de1f138dc1e6389ddf9d781f576..06b42452da9f20dfe2f10a6fa66a74f108d15656 100644 (file)
--- a/widgets/imap.lua
+++ b/widgets/imap.lua
@@ -7,42 +7,41 @@
 --]]
 
 local helpers      = require("lain.helpers")
 --]]
 
 local helpers      = require("lain.helpers")

+local async        = require("lain.asyncshell")

 
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
 
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 

-local io           = { popen  = io.popen }

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

+local tonumber     = tonumber

 
 local setmetatable = setmetatable
 
 -- Mail IMAP check
 -- lain.widgets.imap
 
 local setmetatable = setmetatable
 
 -- Mail IMAP check
 -- lain.widgets.imap

-local imap = {}

 
 local function worker(args)
 
 local function worker(args)

-    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 followtag   = args.followtag 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)
 
     local request = "-X 'SEARCH (UNSEEN)'"
 
     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
+        password = helpers.read_pipe(password):gsub("\n", "")

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


@@ -52,35 +51,42 @@ local function worker(args)
             icon     = helpers.icons_dir .. "mail.png",
             position = "top_left"
         }
             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)
-
-        f = io.popen(curl)
-        ws = f:read("*all")
-        f:close()

 
 

-        t, mailcount = string.gsub(ws, "%d", "")
-        t = nil -- because it's useless
+        if followtag then
+            mail_notification_preset.screen = awful.screen.focused()
+        end

 
 

-        widget = imap.widget
-        settings()
+        curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%q %s -k",
+               head_command, server, port, mail, password, request)

 
 

-        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"
+        async.request(curl, function(f)
+            _, mailcount = string.gsub(f, "%d+", "")
+            _ = nil
+
+            widget = imap.widget
+            settings()
+
+            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
             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)
     end
 
     helpers.newtimer(mail, timeout, update, true)

-    return imap.widget
+
+    return setmetatable(imap, { __index = imap.widget })

 end
 
 end
 

-return setmetatable(imap, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })