#289 fix attempt

[etc/awesome.git] / helpers.lua

diff --git a/helpers.lua b/helpers.lua
index 8eed10fa81ffa6be90788fc230ecbb4696918d60..f32c4ad57bee9d28e9bf434344d151ab0f0c2cf0 100644 (file)
--- a/helpers.lua
+++ b/helpers.lua
@@ -6,17 +6,15 @@
                                                   
 --]]
 
                                                   
 --]]
 

-local debug  = require("debug")

 
 

-local assert = assert
-local capi   = { timer = require ("gears.timer") }
-local io     = { open  = io.open,
-                 lines = io.lines,
-                 popen = io.popen }
-local rawget = rawget
-local table  = { sort   = table.sort }
-
-local wibox  = require("wibox")
+local easy_async = require("awful.spawn").easy_async
+local timer      = require("gears.timer")
+local debug      = require("debug")
+local io         = { lines = io.lines,
+                     open  = io.open,
+                     popen = io.popen }
+local rawget     = rawget
+local table      = { sort  = table.sort }

 
 -- Lain helper functions for internal use
 -- lain.helpers
 
 -- Lain helper functions for internal use
 -- lain.helpers


@@ -92,38 +90,43 @@ end
 
 helpers.timer_table = {}
 
 
 helpers.timer_table = {}
 

-function helpers.newtimer(_name, timeout, fun, nostart)
-    local name = timeout
+function helpers.newtimer(name, timeout, fun, nostart, stoppable)
+    if not name or #name == 0 then return end
+    name = (stoppable and name) or timeout

     if not helpers.timer_table[name] then
     if not helpers.timer_table[name] then

-        helpers.timer_table[name] = capi.timer({ timeout = timeout })
+        helpers.timer_table[name] = timer({ timeout = timeout })

         helpers.timer_table[name]:start()
     end
     helpers.timer_table[name]:connect_signal("timeout", fun)
     if not nostart then
         helpers.timer_table[name]:emit_signal("timeout")
     end
         helpers.timer_table[name]:start()
     end
     helpers.timer_table[name]:connect_signal("timeout", fun)
     if not nostart then
         helpers.timer_table[name]:emit_signal("timeout")
     end

+    return stoppable and helpers.timer_table[name]

 end
 
 -- }}}
 
 -- {{{ Pipe operations
 
 end
 
 -- }}}
 
 -- {{{ Pipe operations
 

--- read the full output of a command output
+-- return the full output of an input command (synchronous pipe)
+-- @param cmd the input command
+-- @return command output (string)

 function helpers.read_pipe(cmd)
 function helpers.read_pipe(cmd)

-   local f = assert(io.popen(cmd))
+   local f = io.popen(cmd)

    local output = f:read("*all")
    f:close()
    return output
 end
 
    local output = f:read("*all")
    f:close()
    return output
 end
 

--- return line iterator of a command output
-function helpers.pipelines(...)
-    local f = assert(io.popen(...))
-    return function () -- iterator
-        local data = f:read()
-        if data == nil then f:close() end
-        return data
-    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)
+    return easy_async(cmd,
+    function (stdout, stderr, reason, exit_code)
+        callback(stdout)
+    end)

 end
 
 -- }}}
 end
 
 -- }}}


@@ -172,14 +175,6 @@ function helpers.spairs(t)
     end
 end
 
     end
 end
 

--- create a lain textbox widget
-function helpers.make_widget_textbox()
-    local w = wibox.widget.textbox('')
-    local t = wibox.widget.base.make_widget(w)
-    t.widget = w
-    return t
-end
-

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