Merge pull request #56 from wooparadog/volumn-for-human

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

diff --git a/widgets/imap.lua b/widgets/imap.lua
index 4df3610db18364fdfb4b5fa63e3a6c3b97249928..c4040323f3d897412bc28e800b9d4d288bd6324f 100644 (file)
--- a/widgets/imap.lua
+++ b/widgets/imap.lua
@@ -14,14 +14,15 @@ local wibox        = require("wibox")
 local io           = { popen  = io.popen }
 local string       = { format = string.format,
                        gsub   = string.gsub }
+local tonumber     = tonumber
 
 local setmetatable = setmetatable
 
 -- Mail IMAP check
 -- lain.widgets.imap
-local imap = {}
 
 local function worker(args)
+    local imap     = {}
     local args     = args or {}
 
     local server   = args.server
@@ -47,12 +48,12 @@ local function worker(args)
 
     imap.widget = wibox.widget.textbox('')
 
-    function imap.update()
-        notification_preset = {
+    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)
 
@@ -60,27 +61,31 @@ local function worker(args)
         ws = f:read("*all")
         f:close()
 
-        t, mailcount = string.gsub(ws, "%d", "")
-        t = nil -- because it's useless
+        _, mailcount = string.gsub(ws, "%d+", "")
+        _ = nil
 
         widget = imap.widget
         settings()
 
-        if mailcount > helpers.get_map(mail) and mailcount >= 1
+        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 = notification_preset, text = nt })
+            naughty.notify({
+                preset = mail_notification_preset,
+                text = nt,
+                screen = client.focus and client.focus.screen or 1
+            })
         end
 
         helpers.set_map(mail, mailcount)
     end
 
-    helpers.newtimer(mail, timeout, imap.update, true)
-    return imap.widget
+    helpers.newtimer(mail, timeout, update, true)
+    return setmetatable(imap, { __index = imap.widget })
 end
 
-return setmetatable(imap, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })