Fixed another 1 pixel discrepancy

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

diff --git a/widgets/maildir.lua b/widgets/maildir.lua
index b5437bd9bee0d7d9530e6617fb235f2ce86650c0..eed613840921ecb955ee427489323be5db989a84 100644 (file)
--- a/widgets/maildir.lua
+++ b/widgets/maildir.lua
@@ -7,14 +7,14 @@
                                                   
 --]]
 
-local markup          = require("lain.util.markup")
-local run_in_terminal = require("lain.helpers").run_in_terminal
+local newtimer        = require("lain.helpers").newtimer
+local read_pipe       = require("lain.helpers").read_pipe
 
-local awful           = require("awful")
-local beautiful       = require("beautiful")
 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,
@@ -27,26 +27,21 @@ local setmetatable    = setmetatable
 -- lain.widgets.maildir
 local maildir = {}
 
-function worker(args)
-    local args = args or {}
-    local mailpath = args.mailpath or os.getenv("HOME") .. "/Mail"
+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 refresh_timeout = args.refresh_timeout or 60
-    local header = args.header or " Mail "
-    local header_color = args.header_color or beautiful.fg_normal or "#FFFFFF"
-    local color_newmail = args.color_newmail or beautiful.fg_focus or "#FFFFFF"
-    local color_nomail = args.color_nomail or beautiful.fg_normal or "#FFFFFF"
-    local app = args.app or "mutt"
-    local shadow = args.shadow or false
-
-    local mymailcheck = wibox.widget.textbox()
-    local mymailcheckupdate = function()
+    local settings     = args.settings or function() end
+
+    maildir.widget = wibox.widget.textbox('')
+
+    function update()
         -- Find pathes to mailboxes.
         local p = io.popen("find " .. mailpath ..
                            " -mindepth 1 -maxdepth 1 -type d" ..
                            " -not -name .git")
         local boxes = {}
-        local line = ""
         repeat
             line = p:read("*l")
             if line ~= nil
@@ -56,10 +51,9 @@ 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 .. "/*([^/]+)")
@@ -71,17 +65,20 @@ function worker(args)
             end
         until line == nil
 
+       p:close()
         table.sort(boxes)
 
-        local newmail = ""
-        local count = 0
+        newmail = "no mail"
+        -- Count the total number of mails irrespective of where it was found
+        total = 0
+
         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
-                if newmail == ""
+                total = total + number
+                if newmail == "no mail"
                 then
                     newmail = box .. "(" .. number .. ")"
                 else
@@ -91,39 +88,12 @@ function worker(args)
             end
         end
 
-        if count == 1 then
-            -- it will be only executed once
-            for box, number in pairs(boxes)
-            do  -- it's useless to show only INBOX(x)
-                if box == "INBOX" then newmail = number end
-            end
-        end
-
-        if newmail == ""
-        then
-            if shadow
-            then
-                mymailcheck:set_text('')
-            else
-                myimapcheck:set_markup(markup(color_nomail, " no mail "))
-            end
-        else
-            myimapcheck:set_markup(markup(header_color, header) ..
-                                   markup(color_newmail, newmail) .. " ")
-        end
+        widget = maildir.widget
+        settings()
     end
 
-    local mymailchecktimer = timer({ timeout = refresh_timeout })
-    mymailchecktimer:connect_signal("timeout", mymailcheckupdate)
-    mymailchecktimer:start()
-    mymailcheck:buttons(awful.util.table.join(
-        awful.button({}, 0,
-            function()
-                run_in_terminal(app)
-            end)
-    ))
-
-    return mymailcheck
+    newtimer(mailpath, timeout, update, true)
+    return maildir.widget
 end
 
 return setmetatable(maildir, { __call = function(_, ...) return worker(...) end })