X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/5f1fd821a0ebbb2d61cb3c382ca199d109e4bbd8..58b2a122dd20cc4d1d15a29a27e618c9c88050cc:/widgets/maildir.lua?ds=inline

diff --git a/widgets/maildir.lua b/widgets/maildir.lua
index 7d4ca28..7e7b246 100644
--- a/widgets/maildir.lua
+++ b/widgets/maildir.lua
@@ -7,26 +7,18 @@
                                                   
 --]]
 
-local spawn            = require("awful").spawn
-local wibox            = require("wibox")
-
-local element_in_table = require("lain.helpers").element_in_table
-local newtimer         = require("lain.helpers").newtimer
-local read_pipe        = require("lain.helpers").read_pipe
-local spairs           = require("lain.helpers").spairs
-
-local io               = { popen  = io.popen }
-local os               = { getenv = os.getenv }
-local pairs            = pairs
-local string           = { format = string.format,
-                           len    = string.len,
-                           match  = string.match }
-
-local setmetatable     = setmetatable
-
--- Maildir check
+local awful        = require("awful")
+local wibox        = require("wibox")
+local helpers      = require("lain.helpers")
+local io           = { popen  = io.popen }
+local os           = { getenv = os.getenv }
+local string       = { format = string.format,
+                       match  = string.match }
+local setmetatable = setmetatable
+
+-- Maildir check (synchronous)
 -- lain.widgets.maildir
-local maildir = {}
+local maildir = helpers.make_widget_textbox()
 
 local function worker(args)
     local args         = args or {}
@@ -34,12 +26,10 @@ 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('')
+    local cmd          = args.cmd
 
-    function update()
-        if ext_mail_cmd then awful.spawn(ext_mail_cmd) end
+    function maildir.update()
+        if cmd then helpers.async({ awful.util.shell, "-c", cmd }, function() end) end
 
         -- Find pathes to mailboxes.
         local p = io.popen(string.format("find %s -mindepth 1 -maxdepth 2 -type d -not -name .git", mailpath))
@@ -52,11 +42,11 @@ 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.
-                local mailstring = read_pipe(string.format("find %s /new -mindepth 1 -type f -not -name '.*' -printf a", line))
+                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)
+                local nummails = #mailstring
 
                 if nummails > 0 then
                     boxes[box] = nummails
@@ -68,9 +58,9 @@ local function worker(args)
         local newmail = "no mail"
         local total = 0
 
-        for box, number in spairs(boxes) do
+        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 not helpers.element_in_table(box, ignore_boxes) then
                 total = total + number
                 if newmail == "no mail" then
                     newmail = string.format("%s(%s)", box, number)
@@ -81,13 +71,12 @@ local function worker(args)
         end
 
         widget = maildir.widget
-
         settings()
     end
 
-    newtimer(mailpath, timeout, update, true)
+    maildir.timer = helpers.newtimer(mailpath, timeout, maildir.update, true, true)
 
-    return setmetatable(maildir, { __index = maildir.widget })
+    return maildir
 end
 
 return setmetatable(maildir, { __call = function(_, ...) return worker(...) end })