]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/imap.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / etc / awesome.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
imap: password can now be a string, a table or a function to execute
[etc/awesome.git] / widgets / imap.lua
diff --git a/widgets/imap.lua b/widgets/imap.lua
index 94652b69294c7a92169626bf0769af17fb7fcedc..770a1bc8b3d6f07a30b33794dce761a4a156ffff 100644 (file)
--- a/widgets/imap.lua
+++ b/widgets/imap.lua
@@ -6,161 +6,82 @@
                                                   
 --]]
 
                                                   
 --]]
 
-local markup       = require("lain.util.markup")
 local helpers      = require("lain.helpers")
 local helpers      = require("lain.helpers")
-
-local awful        = require("awful")
-local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 local naughty      = require("naughty")
 local wibox        = require("wibox")
-
-local io           = io
+local string       = { format = string.format,
+                       gsub   = string.gsub }
+local type         = type
 local tonumber     = tonumber
 local tonumber     = tonumber
-local string       = string
-
 local setmetatable = setmetatable
 
 local setmetatable = setmetatable
 
--- Mail imap check
+-- Mail IMAP check
 -- lain.widgets.imap
 -- lain.widgets.imap
-local imap = {} 
-
-function worker(args)
-    local args = args or {}
-
-    local server = args.server
-    local mail = args.mail
-    local password = args.password
-
-    local port = args.port or "993"
-    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 mail_encoding = args.mail_encoding or nil
-    local maxlen = args.maxlen or 200
-    local app = args.app or "mutt"
-    local is_plain = args.is_plain or false
-    local shadow = args.shadow or false
-
-    helpers.set_map(mail, true)
-    helpers.set_map(mail .. " count", "0")
-
-    local checkmail = helpers.scripts_dir .. "checkmail"
-
-    if not is_plain
-    then
-        local f = io.popen(password)
-        password = f:read("*all"):gsub("\n", ""):gsub("\r", "")
-        f:close()
-    end
 
 
-    local myimapcheck = wibox.widget.textbox()
-
-    local myimapcheckupdate = function()
-        function set_nomail()
-            if shadow
-            then
-                myimapcheck:set_text('')
-            else
-                myimapcheck:set_markup(markup(color_nomail, " no mail "))
-            end
+local function worker(args)
+    local imap      = helpers.make_widget_textbox()
+    local args      = args or {}
+    local server    = args.server
+    local mail      = args.mail
+    local password  = args.password
+    local port      = args.port or 993
+    local timeout   = args.timeout or 60
+    local is_plain  = args.is_plain or false
+    local followtag = args.followtag or false
+    local settings  = args.settings or function() end
+
+    local head_command = "curl --connect-timeout 3 -fsm 3"
+    local request = "-X 'SEARCH (UNSEEN)'"
+
+    if not server or not mail or not password then return end
+
+    helpers.set_map(mail, 0)
+
+    if not is_plain then
+        if type(password) == "string" or type(password) == "table" then
+            helpers.async(password, function(f) password = f:gsub("\n", "") end)
+        elseif type(password) == "function" then
+            local p = password()
         end
         end
+    end
 
 
-        conn = io.popen("ip link show")
-        check_conn = conn:read("*all") 
-        conn:close()
+    function update()
+        mail_notification_preset = {
+            icon     = helpers.icons_dir .. "mail.png",
+            position = "top_left"
+        }
 
 
-        if not check_conn:find("state UP") then
-               set_nomail()
-               return
+        if followtag then
+            mail_notification_preset.screen = awful.screen.focused()
         end
 
         end
 
-        to_execute = checkmail .. ' -s ' .. server ..
-                     ' -u ' .. mail .. ' -p ' .. password
-                     .. ' --port ' .. port
+        curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%q %s -k",
+               head_command, server, port, mail, password, request)
 
 
-        if mail_encoding ~= nil
-        then
-            to_execute = to_execute .. ' --encoding '
-                         .. mail_encoding
-        end
+        helpers.async(curl, function(f)
+            _, mailcount = string.gsub(f, "%d+", "")
+            _ = nil
 
 
-        f = io.popen(to_execute)
-        ws = f:read("*all")
-        f:close()
-
-        if ws:find("No new messages") ~= nil
-        then
-            helpers.set_map(mail, true)
-            set_nomail()
-        elseif ws:find("CheckMailError: invalid credentials") ~= nil
-        then
-            helpers.set_map(mail, true)
-            myimapcheck.set_markup(markup(header_color, header) ..
-                                   markup(color_newmail, "invalid credentials "))
-        else
-            mailcount = ws:match("%d") or "?"
-
-            if helpers.get_map(mail .. " count") ~= mailcount and mailcount ~= "?"
-            then
-                helpers.set_map(mail, true)
-                helpers.set_map(mail .. " count", mailcount)
-            end
+            widget = imap.widget
+            settings()
 
 
-            myimapcheck:set_markup(markup(header_color, header) ..
-                                   markup(color_newmail, mailcount) .. " ")
-
-            if helpers.get_map(mail)
-            then
-                if mailcount == "?"
-                -- May happens sometimes using keyrings or other password fetchers.
-                -- Since this should be automatically fixed in short times, we threat
-                -- this exception delaying the update to the next timeout.
-                then
-                    set_nomail()
-                    return
-                elseif tonumber(mailcount) >= 1
-                then
-                    notify_title = ws:match(mail .. " has %d new message.?")
-                    ws = ws:gsub(notify_title, "", 1):gsub("\n", "", 2)
-
-                    ws = ws:gsub("--Content.%S+.-\n", "")
-                    ws = ws:gsub("--%d+.-\n", "")
-
-                    if string.len(ws) > maxlen
-                    then
-                        ws = ws:sub(1, maxlen) .. "[...]"
-                    end
-
-                    notify_title = notify_title:gsub("\n", "")
+            if 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
                 end
+                naughty.notify({ preset = mail_notification_preset, text = nt })
+            end
 
 
-                naughty.notify({ title = notify_title,
-                                 fg = color_newmail,
-                                 text = ws,
-                                 icon = beautiful.lain_mail_notify or
-                                        helpers.icons_dir .. "mail.png",
-                                 timeout = 8,
-                                 position = "top_left" })
+            helpers.set_map(mail, mailcount)
+        end)
 
 
-                helpers.set_map(mail, false)
-            end
-        end
     end
 
     end
 
-    local myimapchecktimer = timer({ timeout = refresh_timeout })
-    myimapchecktimer:connect_signal("timeout", myimapcheckupdate)
-    myimapchecktimer:start()
-    myimapcheck:buttons(awful.util.table.join(
-        awful.button({}, 0,
-
-            function()
-                helpers.run_in_terminal(app)
-            end)
-    ))
+    imap.timer = helpers.newtimer(mail, timeout, update, true, true)
 
 
-    return myimapcheck
+    return imap
 end
 
 end
 
-return setmetatable(imap, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })
awesome window-manager configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.