abase widget added

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

diff --git a/widgets/maildir.lua b/widgets/maildir.lua
index 00ab771dce2350105928199911d6f09fdc6f15a3..bd792210530346d92ae92de247ee6310ab817bff 100644 (file)
--- a/widgets/maildir.lua
+++ b/widgets/maildir.lua
@@ -11,6 +11,8 @@ local newtimer        = require("lain.helpers").newtimer
 
 local wibox           = require("wibox")
 
 
 local wibox           = require("wibox")
 

+local util            = require("lain.util")
+

 local io              = io
 local os              = { getenv = os.getenv }
 local pairs           = pairs
 local io              = io
 local os              = { getenv = os.getenv }
 local pairs           = pairs


@@ -24,14 +26,14 @@ local setmetatable    = setmetatable
 -- lain.widgets.maildir
 local maildir = {}
 
 -- 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 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
 

-    widget = wibox.widget.textbox('')
+    maildir.widget = wibox.widget.textbox('')

 
     function update()
         -- Find pathes to mailboxes.
 
     function update()
         -- Find pathes to mailboxes.


@@ -51,7 +53,7 @@ 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 @@ 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


@@ -84,12 +87,12 @@ function worker(args)
             end
         end
 
             end
         end
 

+        widget = maildir.widget

         settings()
     end
 
     newtimer(mailpath, timeout, update, true)
         settings()
     end
 
     newtimer(mailpath, timeout, update, true)

-
-    return widget
+    return maildir.widget

 end
 
 return setmetatable(maildir, { __call = function(_, ...) return worker(...) end })
 end
 
 return setmetatable(maildir, { __call = function(_, ...) return worker(...) end })