Merge pull request #75 from osleg/master

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

diff --git a/widgets/maildir.lua b/widgets/maildir.lua
index d4608812e7c62e92e30cfced6eae628b747fc393..246341f98962b5d352a408ccb954738b2bf35665 100644 (file)
--- a/widgets/maildir.lua
+++ b/widgets/maildir.lua
@@ -11,7 +11,9 @@ local newtimer        = require("lain.helpers").newtimer
 
 local wibox           = require("wibox")
 
 
 local wibox           = require("wibox")
 

-local io              = io
+local util            = require("lain.util")
+
+local io              = { popen  = io.popen }

 local os              = { getenv = os.getenv }
 local pairs           = pairs
 local string          = { len    = string.len,
 local os              = { getenv = os.getenv }
 local pairs           = pairs
 local string          = { len    = string.len,


@@ -51,7 +53,7 @@ local function worker(args)
                 local np = io.popen("find " .. line ..
                                     "/new -mindepth 1 -type f " ..
                                     "-not -name '.*' -printf a")
                 local np = io.popen("find " .. line ..
                                     "/new -mindepth 1 -type f " ..
                                     "-not -name '.*' -printf a")

-                local mailstring = np:read("*all")
+                local mailstring = np:read("*a")

 
                 -- Strip off leading mailpath.
                 local box = string.match(line, mailpath .. "/*([^/]+)")
 
                 -- Strip off leading mailpath.
                 local box = string.match(line, mailpath .. "/*([^/]+)")


@@ -66,15 +68,16 @@ local function worker(args)
         table.sort(boxes)
 
         newmail = "no mail"
         table.sort(boxes)
 
         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)
         do
         for box, number in pairs(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
             -- 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
                 then
                     newmail = box .. "(" .. number .. ")"
                 else