Fix regression in pulsebar.lua

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

diff --git a/widgets/maildir.lua b/widgets/maildir.lua
index 7d4ca28bd3d999bdd9839f39ec87346d6e24d210..bef09f4a4527d22d2033064c6dd759b7933f64ad 100644 (file)
--- a/widgets/maildir.lua
+++ b/widgets/maildir.lua
@@ -7,24 +7,16 @@
                                                   
 --]]
 
                                                   
 --]]
 

-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 = {}
 
 -- lain.widgets.maildir
 local maildir = {}
 


@@ -36,7 +28,7 @@ local function worker(args)
     local settings     = args.settings or function() end
     local ext_mail_cmd = args.external_mail_cmd
 
     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
 
     function update()
         if ext_mail_cmd then awful.spawn(ext_mail_cmd) end


@@ -52,11 +44,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.
                 -- 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 .. "/(.*)")
 
                 -- 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
 
                 if nummails > 0 then
                     boxes[box] = nummails


@@ -68,9 +60,9 @@ local function worker(args)
         local newmail = "no mail"
         local total = 0
 
         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.
             -- 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)
                 total = total + number
                 if newmail == "no mail" then
                     newmail = string.format("%s(%s)", box, number)


@@ -81,11 +73,10 @@ local function worker(args)
         end
 
         widget = maildir.widget
         end
 
         widget = maildir.widget

-

         settings()
     end
 
         settings()
     end
 

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

 
     return setmetatable(maildir, { __index = maildir.widget })
 end
 
     return setmetatable(maildir, { __index = maildir.widget })
 end