Merge branch 'andering-patch-3'

[etc/awesome.git] / helpers.lua

diff --git a/helpers.lua b/helpers.lua
index 5e958c3937e6d84fccf1a065a2d953b86f4da044..8fb794c1f0e1cb790d02f65e27fb80825ff85b53 100644 (file)
--- a/helpers.lua
+++ b/helpers.lua
@@ -49,13 +49,25 @@ end
 -- list/table if the file does not exist
 function helpers.lines_from(file)
   if not helpers.file_exists(file) then return {} end
 -- list/table if the file does not exist
 function helpers.lines_from(file)
   if not helpers.file_exists(file) then return {} end

-  lines = {}
+  local lines = {}

   for line in io.lines(file) do
     lines[#lines + 1] = line
   end
   return lines
 end
 
   for line in io.lines(file) do
     lines[#lines + 1] = line
   end
   return lines
 end
 

+-- match all lines from a file, returns an empty
+-- list/table if the file or match does not exist
+function helpers.lines_match(regexp, file)
+       local lines = {}
+       for index,line in pairs(helpers.lines_from(file)) do
+               if string.match(line, regexp) then 
+                       lines[index] = line
+               end  
+       end
+       return lines
+end
+

 -- get first line of a file, return nil if
 -- the file does not exist
 function helpers.first_line(file)
 -- get first line of a file, return nil if
 -- the file does not exist
 function helpers.first_line(file)


@@ -77,8 +89,11 @@ end
 
 helpers.timer_table = {}
 
 
 helpers.timer_table = {}
 

-function helpers.newtimer(name, timeout, fun, nostart)
-    helpers.timer_table[name] = capi.timer({ timeout = timeout })
+function helpers.newtimer(_name, timeout, fun, nostart)
+    local name = timeout
+    if not helpers.timer_table[name] then
+        helpers.timer_table[name] = capi.timer({ timeout = timeout })
+    end

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