pull #201 fixes

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

diff --git a/widgets/maildir.lua b/widgets/maildir.lua
index b5437bd9bee0d7d9530e6617fb235f2ce86650c0..c9937b47e0d2f4d2eb15a00cc945aab6e8920b4b 100644 (file)
--- a/widgets/maildir.lua
+++ b/widgets/maildir.lua
@@ -7,19 +7,20 @@
                                                   
 --]]
 
                                                   
 --]]
 

-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 spairs          = require("lain.helpers").spairs

 
 

-local awful           = require("awful")
-local beautiful       = require("beautiful")

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

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

 local os              = { getenv = os.getenv }
 local pairs           = pairs
 local string          = { len    = string.len,
                           match  = string.match }
 local os              = { getenv = os.getenv }
 local pairs           = pairs
 local string          = { len    = string.len,
                           match  = string.match }

-local table           = { sort   = table.sort }

 
 local setmetatable    = setmetatable
 
 
 local setmetatable    = setmetatable
 


@@ -27,26 +28,27 @@ local setmetatable    = setmetatable
 -- lain.widgets.maildir
 local maildir = {}
 
 -- 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 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
+    local ext_mail_cmd = args.external_mail_cmd
+
+    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 = {}
                            " -not -name .git")
         local boxes = {}

-        local line = ""

         repeat
             line = p:read("*l")
             if line ~= nil
         repeat
             line = p:read("*l")
             if line ~= nil


@@ -56,13 +58,12 @@ 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 np = io.popen("find " .. line ..
+                local mailstring = read_pipe("find " .. line ..

                                     "/new -mindepth 1 -type f " ..
                                     "-not -name '.*' -printf a")
                                     "/new -mindepth 1 -type f " ..
                                     "-not -name '.*' -printf a")

-                local mailstring = np:read("*all")

 
                 -- Strip off leading mailpath.
 
                 -- 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


@@ -71,17 +72,19 @@ function worker(args)
             end
         until line == nil
 
             end
         until line == nil
 

-        table.sort(boxes)
+        p:close()

 
 

-        local newmail = ""
-        local count = 0
-        for box, number in pairs(boxes)
+        newmail = "no mail"
+        -- Count the total number of mails irrespective of where it was found
+        total = 0
+
+        for box, number in spairs(boxes)

         do
         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
             -- 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
                 then
                     newmail = box .. "(" .. number .. ")"
                 else


@@ -91,39 +94,12 @@ function worker(args)
             end
         end
 
             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
 
     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 })
 end
 
 return setmetatable(maildir, { __call = function(_, ...) return worker(...) end })