battery: always update status (fix perc) #199 #203

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

diff --git a/widgets/maildir.lua b/widgets/maildir.lua
index 00ab771dce2350105928199911d6f09fdc6f15a3..c9937b47e0d2f4d2eb15a00cc945aab6e8920b4b 100644 (file)
--- a/widgets/maildir.lua
+++ b/widgets/maildir.lua
@@ -8,15 +8,19 @@
 --]]
 
 local newtimer        = require("lain.helpers").newtimer
+local read_pipe       = require("lain.helpers").read_pipe
+local spairs          = require("lain.helpers").spairs
 
 local wibox           = require("wibox")
 
-local io              = io
+local awful           = require("awful")
+local util            = require("lain.util")
+
+local io              = { popen  = io.popen }
 local os              = { getenv = os.getenv }
 local pairs           = pairs
 local string          = { len    = string.len,
                           match  = string.match }
-local table           = { sort   = table.sort }
 
 local setmetatable    = setmetatable
 
@@ -24,19 +28,25 @@ local setmetatable    = setmetatable
 -- lain.widgets.maildir
 local maildir = {}
 
-function worker(args)
+local function worker(args)
     local args         = args or {}
     local timeout      = args.timeout or 60
     local mailpath     = args.mailpath or os.getenv("HOME") .. "/Mail"
     local ignore_boxes = args.ignore_boxes or {}
     local settings     = args.settings or function() end
+    local ext_mail_cmd = args.external_mail_cmd
 
-    widget = wibox.widget.textbox('')
+    maildir.widget = wibox.widget.textbox('')
 
     function update()
+        if ext_mail_cmd ~= nil
+        then
+            awful.util.spawn(ext_mail_cmd)
+        end
+
         -- Find pathes to mailboxes.
         local p = io.popen("find " .. mailpath ..
-                           " -mindepth 1 -maxdepth 1 -type d" ..
+                           " -mindepth 1 -maxdepth 2 -type d" ..
                            " -not -name .git")
         local boxes = {}
         repeat
@@ -48,13 +58,12 @@ function worker(args)
                 -- match files that begin with a dot.
                 -- Afterwards the length of this string is the number of
                 -- new mails in that box.
-                local np = io.popen("find " .. line ..
+                local mailstring = read_pipe("find " .. line ..
                                     "/new -mindepth 1 -type f " ..
                                     "-not -name '.*' -printf a")
-                local mailstring = np:read("*all")
 
                 -- Strip off leading mailpath.
-                local box = string.match(line, mailpath .. "/*([^/]+)")
+                local box = string.match(line, mailpath .. "/(.*)")
                 local nummails = string.len(mailstring)
                 if nummails > 0
                 then
@@ -63,18 +72,19 @@ function worker(args)
             end
         until line == nil
 
-        table.sort(boxes)
+        p:close()
 
         newmail = "no mail"
+        -- Count the total number of mails irrespective of where it was found
+        total = 0
 
-        local count = 0
-        for box, number in pairs(boxes)
+        for box, number in spairs(boxes)
         do
-            count = count + 1
             -- Add this box only if it's not to be ignored.
             if not util.element_in_table(box, ignore_boxes)
             then
-                if newmail == ""
+                total = total + number
+                if newmail == "no mail"
                 then
                     newmail = box .. "(" .. number .. ")"
                 else
@@ -84,12 +94,12 @@ function worker(args)
             end
         end
 
+        widget = maildir.widget
         settings()
     end
 
     newtimer(mailpath, timeout, update, true)
-
-    return widget
+    return maildir.widget
 end
 
 return setmetatable(maildir, { __call = function(_, ...) return worker(...) end })