Fixed another 1 pixel discrepancy

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

diff --git a/widgets/maildir.lua b/widgets/maildir.lua
index 4ac34bc25fece45f199de6a001b025cbff331447..eed613840921ecb955ee427489323be5db989a84 100644 (file)
--- a/widgets/maildir.lua
+++ b/widgets/maildir.lua
@@ -8,10 +8,13 @@
 --]]
 
 local newtimer        = require("lain.helpers").newtimer
 --]]
 
 local newtimer        = require("lain.helpers").newtimer

+local read_pipe       = require("lain.helpers").read_pipe

 
 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,


@@ -33,7 +36,7 @@ local function worker(args)
 
     maildir.widget = wibox.widget.textbox('')
 
 
     maildir.widget = wibox.widget.textbox('')
 

-    function maildir.update()
+    function update()

         -- Find pathes to mailboxes.
         local p = io.popen("find " .. mailpath ..
                            " -mindepth 1 -maxdepth 1 -type d" ..
         -- Find pathes to mailboxes.
         local p = io.popen("find " .. mailpath ..
                            " -mindepth 1 -maxdepth 1 -type d" ..


@@ -48,10 +51,9 @@ local 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.
                 -- 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")
                                     "/new -mindepth 1 -type f " ..
                                     "-not -name '.*' -printf a")

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

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


@@ -63,18 +65,20 @@ local function worker(args)
             end
         until line == nil
 
             end
         until line == nil
 

+       p:close()

         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


@@ -88,8 +92,7 @@ local function worker(args)
         settings()
     end
 
         settings()
     end
 

-    newtimer(mailpath, timeout, maildir.update, true)
-
+    newtimer(mailpath, timeout, update, true)

     return maildir.widget
 end
 
     return maildir.widget
 end