X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/e1450f8828c1be4e290cec0a34538ebe6cb86b50..cf2c44249973125a51c370311e7361d9c1e84771:/helpers.lua?ds=inline diff --git a/helpers.lua b/helpers.lua index dbee617..6a47738 100644 --- a/helpers.lua +++ b/helpers.lua @@ -8,10 +8,15 @@ local debug = require("debug") -local capi = { timer = timer } +local assert = assert +local capi = { timer = (type(timer) == 'table' and timer or require ("gears.timer")) } local io = { open = io.open, - lines = io.lines } + lines = io.lines, + popen = io.popen } local rawget = rawget +local table = { sort = table.sort } + +local wibox = require("wibox") -- Lain helper functions for internal use -- lain.helpers @@ -47,13 +52,25 @@ 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 +-- 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) @@ -75,10 +92,13 @@ end 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 }) + helpers.timer_table[name]:start() + end helpers.timer_table[name]:connect_signal("timeout", fun) - helpers.timer_table[name]:start() if not nostart then helpers.timer_table[name]:emit_signal("timeout") end @@ -86,6 +106,28 @@ end -- }}} +-- {{{ Pipe operations + +-- read the full output of a command output +function helpers.read_pipe(cmd) + local f = assert(io.popen(cmd)) + 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 +end + +-- }}} + -- {{{ A map utility helpers.map_table = {} @@ -100,4 +142,34 @@ end -- }}} +-- {{{ Misc + +-- iterate over table of records sorted by keys +function helpers.spairs(t) + -- collect the keys + local keys = {} + for k in pairs(t) do keys[#keys+1] = k end + + table.sort(keys) + + -- return the iterator function + local i = 0 + return function() + i = i + 1 + if keys[i] then + return keys[i], t[keys[i]] + 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