Merge pull request #377 from sim590/menu-iterator

[etc/awesome.git] / widget / imap.lua

diff --git a/widget/imap.lua b/widget/imap.lua
index 1049d03e2112c212d9a854d48a1754e80c62a50c..7c13223e9ed5eb54dbd3eb174458abbcd191ad96 100644 (file)
--- a/widget/imap.lua
+++ b/widget/imap.lua
@@ -1,24 +1,23 @@
-

 --[[
 --[[

-                                                  
-     Licensed under GNU General Public License v2 
-      * (c) 2013, Luke Bonham                     
-                                                  
+
+     Licensed under GNU General Public License v2
+      * (c) 2013, Luca CPZ
+

 --]]
 
 --]]
 

-local helpers      = require("lain.helpers")
-local naughty      = require("naughty")
-local wibox        = require("wibox")
-local string       = { format = string.format,
-                       gsub   = string.gsub }
-local type         = type
-local tonumber     = tonumber
-local setmetatable = setmetatable
+local helpers  = require("lain.helpers")
+local naughty  = require("naughty")
+local wibox    = require("wibox")
+local awful    = require("awful")
+local string   = { format = string.format,
+                   gsub   = string.gsub }
+local type     = type
+local tonumber = tonumber

 
 -- Mail IMAP check
 -- lain.widget.imap
 
 
 -- Mail IMAP check
 -- lain.widget.imap
 

-local function worker(args)
+local function factory(args)

     local imap      = { widget = wibox.widget.textbox() }
     local args      = args or {}
     local server    = args.server
     local imap      = { widget = wibox.widget.textbox() }
     local args      = args or {}
     local server    = args.server


@@ -28,6 +27,7 @@ local function worker(args)
     local timeout   = args.timeout or 60
     local is_plain  = args.is_plain or false
     local followtag = args.followtag or false
     local timeout   = args.timeout or 60
     local is_plain  = args.is_plain or false
     local followtag = args.followtag or false

+    local notify    = args.notify or "on"

     local settings  = args.settings or function() end
 
     local head_command = "curl --connect-timeout 3 -fsm 3"
     local settings  = args.settings or function() end
 
     local head_command = "curl --connect-timeout 3 -fsm 3"


@@ -60,18 +60,16 @@ local function worker(args)
 
         helpers.async(curl, function(f)
             _, mailcount = string.gsub(f, "%d+", "")
 
         helpers.async(curl, function(f)
             _, mailcount = string.gsub(f, "%d+", "")

-            _ = nil
-

             widget = imap.widget
             settings()
 
             widget = imap.widget
             settings()
 

-            if mailcount >= 1 and mailcount > helpers.get_map(mail) then
+            if notify == "on" and mailcount >= 1 and mailcount > helpers.get_map(mail) then

                 if mailcount == 1 then
                     nt = mail .. " has one new message"
                 else
                     nt = mail .. " has <b>" .. mailcount .. "</b> new messages"
                 end
                 if mailcount == 1 then
                     nt = mail .. " has one new message"
                 else
                     nt = mail .. " has <b>" .. mailcount .. "</b> new messages"
                 end

-                naughty.notify({ preset = mail_notification_preset, text = nt })
+                naughty.notify { preset = mail_notification_preset, text = nt }

             end
 
             helpers.set_map(mail, mailcount)
             end
 
             helpers.set_map(mail, mailcount)


@@ -84,4 +82,4 @@ local function worker(args)
     return imap
 end
 
     return imap
 end
 

-return setmetatable({}, { __call = function(_, ...) return worker(...) end })
+return factory