from asynchshell to awful.spawn.easy_async; started making every widget asynchronous

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

diff --git a/widgets/imap.lua b/widgets/imap.lua
index 62b33d711c5f1061d1ed944e37954b13045ac287..3caf31a6f647518f276183ebdd740f34fb676fe8 100644 (file)
--- a/widgets/imap.lua
+++ b/widgets/imap.lua
@@ -7,12 +7,10 @@
 --]]
 
 local helpers      = require("lain.helpers")
 --]]
 
 local helpers      = require("lain.helpers")

-local async        = require("lain.asyncshell")

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

-local mouse        = mouse

 local string       = { format = string.format,
                        gsub   = string.gsub }
 local tonumber     = tonumber
 local string       = { format = string.format,
                        gsub   = string.gsub }
 local tonumber     = tonumber


@@ -33,7 +31,7 @@ local function worker(args)
     local port        = args.port or 993
     local timeout     = args.timeout or 60
     local is_plain    = args.is_plain or false
     local port        = args.port or 993
     local timeout     = args.timeout or 60
     local is_plain    = args.is_plain or false

-    local followmouse = args.followmouse 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 settings    = args.settings or function() end
 
     local head_command  = "curl --connect-timeout 3 -fsm 3"


@@ -41,11 +39,8 @@ local function worker(args)
 
     helpers.set_map(mail, 0)
 
 
     helpers.set_map(mail, 0)
 

-    if not is_plain
-    then
-        local f = io.popen(password)
-        password = f:read("*all"):gsub("\n", "")
-        f:close()
+    if not is_plain then
+        password = helpers.read_pipe(password):gsub("\n", "")

     end
 
     imap.widget = wibox.widget.textbox('')
     end
 
     imap.widget = wibox.widget.textbox('')


@@ -56,31 +51,26 @@ local function worker(args)
             position = "top_left"
         }
 
             position = "top_left"
         }
 

-        if followmouse then
-            mail_notification_preset.screen = mouse.screen
+        if followtag then
+            mail_notification_preset.screen = awful.screen.focused()

         end
 
         curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%q %s -k",
                head_command, server, port, mail, password, request)
 
         end
 
         curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%q %s -k",
                head_command, server, port, mail, password, request)
 

-        async.request(curl, function(f)
+        helpers.async(curl, function(f)

             _, mailcount = string.gsub(f, "%d+", "")
             _, 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 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)