Merge pull request #214 from 0x0d/master

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

diff --git a/widgets/maildir.lua b/widgets/maildir.lua
index 8cb821dde3633fba8120a8dce30e6a71a35f759e..c9937b47e0d2f4d2eb15a00cc945aab6e8920b4b 100644 (file)
--- a/widgets/maildir.lua
+++ b/widgets/maildir.lua
@@ -9,9 +9,11 @@
 
 local newtimer        = require("lain.helpers").newtimer
 local read_pipe       = require("lain.helpers").read_pipe
 
 local newtimer        = require("lain.helpers").newtimer
 local read_pipe       = require("lain.helpers").read_pipe

+local spairs          = require("lain.helpers").spairs

 
 local wibox           = require("wibox")
 
 
 local wibox           = require("wibox")
 

+local awful           = require("awful")

 local util            = require("lain.util")
 
 local io              = { popen  = io.popen }
 local util            = require("lain.util")
 
 local io              = { popen  = io.popen }


@@ -19,13 +21,12 @@ local os              = { getenv = os.getenv }
 local pairs           = pairs
 local string          = { len    = string.len,
                           match  = string.match }
 local pairs           = pairs
 local string          = { len    = string.len,
                           match  = string.match }

-local table           = { sort   = table.sort }

 
 local setmetatable    = setmetatable
 
 -- Maildir check
 -- lain.widgets.maildir
 
 local setmetatable    = setmetatable
 
 -- Maildir check
 -- lain.widgets.maildir

-local maildir = { total = 0 }
+local maildir = {}

 
 local function worker(args)
     local args         = args or {}
 
 local function worker(args)
     local args         = args or {}


@@ -33,13 +34,19 @@ 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 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('')
 
     function update()
 
     maildir.widget = wibox.widget.textbox('')
 
     function update()

+        if ext_mail_cmd ~= nil
+        then
+            awful.util.spawn(ext_mail_cmd)
+        end
+

         -- Find pathes to mailboxes.
         local p = io.popen("find " .. mailpath ..
         -- Find pathes to mailboxes.
         local p = io.popen("find " .. mailpath ..

-                           " -mindepth 1 -maxdepth 1 -type d" ..
+                           " -mindepth 1 -maxdepth 2 -type d" ..

                            " -not -name .git")
         local boxes = {}
         repeat
                            " -not -name .git")
         local boxes = {}
         repeat


@@ -56,7 +63,7 @@ local function worker(args)
                                     "-not -name '.*' -printf a")
 
                 -- Strip off leading mailpath.
                                     "-not -name '.*' -printf a")
 
                 -- Strip off leading mailpath.

-                local box = string.match(line, mailpath .. "/*([^/]+)")
+                local box = string.match(line, mailpath .. "/(.*)")

                 local nummails = string.len(mailstring)
                 if nummails > 0
                 then
                 local nummails = string.len(mailstring)
                 if nummails > 0
                 then


@@ -66,13 +73,12 @@ local function worker(args)
         until line == nil
 
         p:close()
         until line == nil
 
         p:close()

-        table.sort(boxes)

 
         newmail = "no mail"
         -- Count the total number of mails irrespective of where it was found
         total = 0
 
 
         newmail = "no mail"
         -- Count the total number of mails irrespective of where it was found
         total = 0
 

-        for box, number in pairs(boxes)
+        for box, number in spairs(boxes)

         do
             -- Add this box only if it's not to be ignored.
             if not util.element_in_table(box, ignore_boxes)
         do
             -- Add this box only if it's not to be ignored.
             if not util.element_in_table(box, ignore_boxes)


@@ -88,10 +94,8 @@ local function worker(args)
             end
         end
 
             end
         end
 

-        if maildir.total ~= total then
-            widget = maildir.widget
-            settings()
-        end
+        widget = maildir.widget
+        settings()

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