X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/a659d1a4bc99d27a1746985e13f68efc3dd256c7..ddcaa078273e04ad225334014abe70e1cfd0f17a:/helpers.lua?ds=inline

diff --git a/helpers.lua b/helpers.lua
index 309162e..4e5ce1f 100644
--- a/helpers.lua
+++ b/helpers.lua
@@ -6,14 +6,14 @@
                                                   
 --]]
 
-local debug  = require("debug")
 
-local capi   = { timer = (type(timer) == 'table' and timer or require ("gears.timer")) }
-local io     = { open  = io.open,
-                 lines = io.lines,
-                 popen = io.popen }
-local rawget = rawget
-local table  = { sort   = table.sort }
+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 }
+local rawget     = rawget
+local table      = { sort  = table.sort }
 
 -- Lain helper functions for internal use
 -- lain.helpers
@@ -61,9 +61,9 @@ end
 function helpers.lines_match(regexp, file)
 	local lines = {}
 	for index,line in pairs(helpers.lines_from(file)) do
-		if string.match(line, regexp) then 
+		if string.match(line, regexp) then
 			lines[index] = line
-		end  
+		end
 	end
 	return lines
 end
@@ -89,28 +89,33 @@ end
 
 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
-        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
+    return stoppable and helpers.timer_table[name]
 end
 
 -- }}}
 
 -- {{{ Pipe operations
 
--- read the full output of a pipe (command)
-function helpers.read_pipe(cmd)
-   local f = assert(io.popen(cmd))
-   local output = f:read("*all")
-   f:close()
-   return output
+-- 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
 
 -- }}}
@@ -129,7 +134,19 @@ end
 
 -- }}}
 
---{{{ Iterate over table of records sorted by keys
+-- {{{ Misc
+
+-- check if an element exist on a table
+function helpers.element_in_table(element, tbl)
+    for _, i in pairs(tbl) do
+        if i == element then
+            return true
+        end
+    end
+    return false
+end
+
+-- iterate over table of records sorted by keys
 function helpers.spairs(t)
     -- collect the keys
     local keys = {}
@@ -146,6 +163,7 @@ function helpers.spairs(t)
         end
     end
 end
---}}}
+
+-- }}}
 
 return helpers