X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/6cc550655fad64e784ff87916f3ef439ebaf4c4a..a89bbec6f39985515c33aa71dab1689f863b7851:/widgets/maildir.lua?ds=sidebyside

diff --git a/widgets/maildir.lua b/widgets/maildir.lua
index 5cb6840..2f435b3 100644
--- a/widgets/maildir.lua
+++ b/widgets/maildir.lua
@@ -1,3 +1,4 @@
+
 --[[
                                                   
      Licensed under GNU General Public License v2 
@@ -6,20 +7,18 @@
                                                   
 --]]
 
-local newtimer        = require("lain.helpers").newtimer
-
-local wibox           = require("wibox")
+local awful        = require("awful")
+local wibox        = require("wibox")
+local helpers      = require("lain.helpers")
 
-local io              = io
-local os              = { getenv = os.getenv }
-local pairs           = pairs
-local string          = { len    = string.len,
-                          match  = string.match }
-local table           = { sort   = table.sort }
+local io           = { popen  = io.popen }
+local os           = { getenv = os.getenv }
+local string       = { format = string.format,
+                       match  = string.match }
 
-local setmetatable    = setmetatable
+local setmetatable = setmetatable
 
--- Maildir check
+-- Maildir check (synchronous)
 -- lain.widgets.maildir
 local maildir = {}
 
@@ -29,56 +28,48 @@ local function worker(args)
     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
 
-    maildir.widget = wibox.widget.textbox('')
+    maildir.widget = wibox.widget.textbox()
 
     function update()
+        if ext_mail_cmd then awful.spawn(ext_mail_cmd) end
+
         -- Find pathes to mailboxes.
-        local p = io.popen("find " .. mailpath ..
-                           " -mindepth 1 -maxdepth 1 -type d" ..
-                           " -not -name .git")
+        local p = io.popen(string.format("find %s -mindepth 1 -maxdepth 2 -type d -not -name .git", mailpath))
         local boxes = {}
         repeat
             line = p:read("*l")
-            if line ~= nil
-            then
+            if line then
                 -- Find all files in the "new" subdirectory. For each
                 -- file, print a single character (no newline). Don't
                 -- 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 ..
-                                    "/new -mindepth 1 -type f " ..
-                                    "-not -name '.*' -printf a")
-                local mailstring = np:read("*all")
+                local mailstring = helpers.read_pipe(string.format("find %s /new -mindepth 1 -type f -not -name '.*' -printf a", line))
 
                 -- Strip off leading mailpath.
-                local box = string.match(line, mailpath .. "/*([^/]+)")
-                local nummails = string.len(mailstring)
-                if nummails > 0
-                then
+                local box      = string.match(line, mailpath .. "/(.*)")
+                local nummails = #mailstring
+
+                if nummails > 0 then
                     boxes[box] = nummails
                 end
             end
-        until line == nil
-
-        table.sort(boxes)
+        until not line
+        p:close()
 
-        newmail = "no mail"
+        local newmail = "no mail"
+        local total = 0
 
-        local count = 0
-        for box, number in pairs(boxes)
-        do
-            count = count + 1
+        for box, number in helpers.spairs(boxes) do
             -- Add this box only if it's not to be ignored.
-            if not util.element_in_table(box, ignore_boxes)
-            then
-                if newmail == ""
-                then
-                    newmail = box .. "(" .. number .. ")"
+            if not helpers.element_in_table(box, ignore_boxes) then
+                total = total + number
+                if newmail == "no mail" then
+                    newmail = string.format("%s(%s)", box, number)
                 else
-                    newmail = newmail .. ", " ..
-                              box .. "(" .. number .. ")"
+                    newmail = string.format("%s, %s(%s)", newmail, box, number)
                 end
             end
         end
@@ -87,8 +78,9 @@ local function worker(args)
         settings()
     end
 
-    newtimer(mailpath, timeout, update, true)
-    return maildir.widget
+    helpers.newtimer(mailpath, timeout, update, true)
+
+    return setmetatable(maildir, { __index = maildir.widget })
 end
 
 return setmetatable(maildir, { __call = function(_, ...) return worker(...) end })