]> git.madduck.net Git - etc/awesome.git/blobdiff - widget/imap.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

widget.imap: ensure mailcount is not nil before notifying; closes #400
[etc/awesome.git] / widget / imap.lua
index 17f37cfefa036348120c7c2ad1355146da59a77d..7e83d36e46d798debfcfe30dcc69fd19e1c3cfde 100644 (file)
@@ -1,7 +1,7 @@
 --[[
 
      Licensed under GNU General Public License v2
-      * (c) 2013, Luke Bonham
+      * (c) 2013, Luca CPZ
 
 --]]
 
@@ -9,8 +9,7 @@ local helpers  = require("lain.helpers")
 local naughty  = require("naughty")
 local wibox    = require("wibox")
 local awful    = require("awful")
-local string   = { format = string.format,
-                   gsub   = string.gsub }
+local string   = string
 local type     = type
 local tonumber = tonumber
 
@@ -55,20 +54,17 @@ 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+", "")
+            mailcount = tonumber(f:match("UNSEEN (%d+)"))
             widget = imap.widget
             settings()
 
-            if notify == "on" and 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
+            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