widget.imap: ensure mailcount is not nil before notifying; closes #400

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

diff --git a/widget/imap.lua b/widget/imap.lua
index 0f7fde56ca1ea384a2fa4c12a76047c3be42a88f..7e83d36e46d798debfcfe30dcc69fd19e1c3cfde 100644 (file)
--- a/widget/imap.lua
+++ b/widget/imap.lua
@@ -1,16 +1,15 @@
-
 --[[
-                                                  
-     Licensed under GNU General Public License v2 
-      * (c) 2013, Luke Bonham                     
-                                                  
+
+     Licensed under GNU General Public License v2
+      * (c) 2013, Luca CPZ
+
 --]]
 
 local helpers  = require("lain.helpers")
 local naughty  = require("naughty")
 local wibox    = require("wibox")
-local string   = { format = string.format,
-                   gsub   = string.gsub }
+local awful    = require("awful")
+local string   = string
 local type     = type
 local tonumber = tonumber
 
@@ -27,6 +26,7 @@ local function factory(args)
     local timeout   = args.timeout or 60
     local is_plain  = args.is_plain or false
     local followtag = args.followtag or false
+    local notify    = args.notify or "on"
     local settings  = args.settings or function() end
 
     local head_command = "curl --connect-timeout 3 -fsm 3"
@@ -54,23 +54,18 @@ local function factory(args)
             mail_notification_preset.screen = awful.screen.focused()
         end
 
-        curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%q %s -k",
-               head_command, server, port, mail, password, request)
+        local curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%q %s -k",
+                     head_command, server, port, mail, password, request)
 
         helpers.async(curl, function(f)
-            _, mailcount = string.gsub(f, "%d+", "")
-            _ = nil
-
+            mailcount = tonumber(f:match("UNSEEN (%d+)"))
             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 })
+            if notify == "on" and mailcount and mailcount >= 1 and mailcount > helpers.get_map(mail) then
+                local nt = mail .. " has <b>" .. mailcount .. "</b> new message"
+                if mailcount >= 1 then nt = nt .. "s" end
+                naughty.notify { preset = mail_notification_preset, text = nt }
             end
 
             helpers.set_map(mail, mailcount)