Merge pull request #381 from cool-cool-sweat/helpers-change

[etc/awesome.git] / helpers.lua

diff --git a/helpers.lua b/helpers.lua
index 106978fd41823bb11ab0f466406c8d268ed0b901..b5b663d8cdc8652f8e87c022a75b7b0512dbc2cd 100644 (file)
--- a/helpers.lua
+++ b/helpers.lua
@@ -1,23 +1,18 @@
-

 --[[
 --[[

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

 
 

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

 
 

+--]]
+
+local spawn      = require("awful.spawn")
+local timer      = require("gears.timer")

 local debug      = require("debug")
 local io         = { lines = io.lines,
 local debug      = require("debug")
 local io         = { lines = io.lines,

-                     open  = io.open,
-                     popen = io.popen }
+                     open  = io.open }

 local rawget     = rawget
 local table      = { sort  = table.sort }
 
 local rawget     = rawget
 local table      = { sort  = table.sort }
 

-local easy_async = require("awful.spawn").easy_async
-local timer      = require("gears.timer")
-local wibox      = require("wibox")
-

 -- Lain helper functions for internal use
 -- lain.helpers
 local helpers = {}
 -- Lain helper functions for internal use
 -- lain.helpers
 local helpers = {}


@@ -110,27 +105,34 @@ end
 
 -- {{{ Pipe operations
 
 
 -- {{{ Pipe operations
 

--- return the full output of an input command (synchronous pipe)
--- @param cmd the input command
--- @return command output (string)
-function helpers.read_pipe(cmd)
-   local f = io.popen(cmd)
-   local output = f:read("*all")
-   f:close()
-   return output
-end
-

 -- run a command and execute a function on its output (asynchronous pipe)
 -- @param cmd the input command
 -- @param callback function to execute on cmd output
 -- @return cmd PID
 function helpers.async(cmd, callback)
 -- run a command and execute a function on its output (asynchronous pipe)
 -- @param cmd the input command
 -- @param callback function to execute on cmd output
 -- @return cmd PID
 function helpers.async(cmd, callback)

-    return easy_async(cmd,
+    return spawn.easy_async(cmd,
+    function (stdout, stderr, reason, exit_code)
+        callback(stdout, exit_code)
+    end)
+end
+
+-- like above, but call spawn.easy_async with a shell
+function helpers.async_with_shell(cmd, callback)
+    return spawn.easy_async_with_shell(cmd,

     function (stdout, stderr, reason, exit_code)
     function (stdout, stderr, reason, exit_code)

-        callback(stdout)
+        callback(stdout, exit_code)

     end)
 end
 
     end)
 end
 

+-- run a command and execute a function on its output line by line
+function helpers.line_callback(cmd, callback)
+    return spawn.with_line_callback(cmd, {
+        stdout = function (line)
+            callback(line)
+        end,
+    })
+end
+

 -- }}}
 
 -- {{{ A map utility
 -- }}}
 
 -- {{{ A map utility


@@ -177,15 +179,6 @@ function helpers.spairs(t)
     end
 end
 
     end
 end
 

--- create a textbox with no spacing issues
-function helpers.make_widget_textbox()
-    local w = wibox.widget.textbox()
-    --local t = wibox.widget.base.make_widget(w)
-    --t.widget = w
-    --return t
-    return setmetatable({ widget = w }, { __index = w })
-end
-

 -- }}}
 
 return helpers
 -- }}}
 
 return helpers