X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/cf2c44249973125a51c370311e7361d9c1e84771..d99ce8fdba3d86c7837a1ee60c398fa477365eab:/helpers.lua diff --git a/helpers.lua b/helpers.lua index 6a47738..ab87f76 100644 --- a/helpers.lua +++ b/helpers.lua @@ -1,22 +1,17 @@ - --[[ - - Licensed under GNU General Public License v2 - * (c) 2013, Luke Bonham - ---]] -local debug = require("debug") + Licensed under GNU General Public License v2 + * (c) 2013, Luke Bonham -local assert = assert -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 wibox = require("wibox") +local spawn = require("awful.spawn") +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 @@ -92,38 +87,41 @@ 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 command output -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 spawn.easy_async(cmd, + function (stdout, stderr, reason, exit_code) + callback(stdout) + end) 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 +-- 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) + callback(stdout) + end) end -- }}} @@ -144,6 +142,16 @@ end -- {{{ 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 @@ -162,14 +170,6 @@ function helpers.spairs(t) 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