Merge branch 'new-watch-widget' of https://github.com/actionless/awesome

lib/awful/widget/init.lua

@@ -19,6 +19,7 @@ return
     layoutbox = require("awful.widget.layoutbox");
     textclock = require("awful.widget.textclock");
     keyboardlayout = require("awful.widget.keyboardlayout");
+    watch = require("awful.widget.watch");
 }
 
 -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

lib/awful/widget/watch.lua

@@ -0,0 +1,92 @@
+---------------------------------------------------------------------------
+--- Watch widget.
+-- Here is an example of simple temperature widget which will update each 15
+-- seconds implemented in two different ways.
+-- The first, simpler one, will just display the return command output
+-- (so output is stripped by shell commands).
+-- In the other example `sensors` returns to the widget its full output
+-- and it's trimmed in the widget callback function:
+--
+--     211             mytextclock,
+--     212             wibox.widget.textbox('  |  '),
+--     213             -- one way to do that:
+--     214             awful.widget.watch('bash -c "sensors | grep temp1"', 15),
+--     215             -- another way:
+--     216             awful.widget.watch('sensors', 15, function(widget, stdout)
+--     217               for line in stdout:gmatch("[^\r\n]+") do
+--     218                 if line:match("temp1") then
+--     219                   widget:set_text(line)
+--     220                   return
+--     221                 end
+--     222               end
+--     223             end),
+--     224             mylayoutbox[s],
+-- 
+-- ![Example screenshot](../images/awful_widget_watch.png)
+--
+-- @author Benjamin Petrenko
+-- @author Yauheni Kirylau
+-- @copyright 2015, 2016 Benjamin Petrenko, Yauheni Kirylau
+-- @release @AWESOME_VERSION@
+-- @classmod awful.widget.watch
+---------------------------------------------------------------------------
+
+local setmetatable = setmetatable
+local textbox = require("wibox.widget.textbox")
+local timer = require("gears.timer")
+local spawn = require("awful.spawn")
+
+local watch = { mt = {} }
+
+--- Create a textbox that shows the output of a command
+-- and updates it at a given time interval.
+--
+-- @tparam string|table command The command.
+--
+-- @tparam[opt=5] integer timeout The time interval at which the textbox
+-- will be updated.
+--
+-- @tparam[opt] function callback The function that will be called after
+-- the command output will be received. it is shown in the textbox.
+-- Defaults to:
+--     function(widget, stdout, stderr, exitreason, exitcode)
+--         widget:set_text(stdout)
+--     end
+-- @param callback.widget Base widget instance.
+-- @tparam string callback.stdout Output on stdout.
+-- @tparam string callback.stderr Output on stderr.
+-- @tparam string callback.exitreason Exit Reason.
+-- The reason can be "exit" or "signal".
+-- @tparam integer callback.exitcode Exit code.
+-- For "exit" reason it's the exit code.
+-- For "signal" reason — the signal causing process termination.
+--
+-- @param[opt=wibox.widget.textbox()] base_widget Base widget.
+--
+-- @return The widget used by this watch
+function watch.new(command, timeout, callback, base_widget)
+    timeout = timeout or 5
+    base_widget = base_widget or textbox()
+    callback = callback or function(widget, stdout, stderr, exitreason, exitcode) -- luacheck: no unused args
+        widget:set_text(stdout)
+    end
+    local t = timer { timeout = timeout }
+    t:connect_signal("timeout", function()
+        t:stop()
+        spawn.easy_async(command, function(stdout, stderr, exitreason, exitcode)
+          callback(base_widget, stdout, stderr, exitreason, exitcode)
+          t:again()
+        end)
+    end)
+    t:start()
+    t:emit_signal("timeout")
+    return base_widget
+end
+
+function watch.mt.__call(_, ...)
+    return watch.new(...)
+end
+
+return setmetatable(watch, watch.mt)
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

tests/test-awful-widget-watch.lua

@@ -0,0 +1,30 @@
+--- Test for awful.widget.watch
+
+local watch = require("awful.widget.watch")
+
+local callbacks_done = 0
+
+local steps = {
+    function(count)
+        if count == 1 then
+            watch(
+                "echo hi", 0.1,
+                function(widget, stdout, stderr, exitreason, exitcode)
+                    assert(widget == "i_am_widget_mock", widget)
+                    assert(stdout == "hi\n", stdout)
+                    assert(stderr == "", stderr)
+                    assert(exitreason == "exit", exitreason)
+                    assert(exitcode == 0, exitcode)
+                    callbacks_done = callbacks_done + 1
+                end,
+                "i_am_widget_mock"
+            )
+        end
+        if callbacks_done > 1 then  -- timer fired at least twice
+            return true
+        end
+    end
+}
+require("_runner").run_steps(steps)
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80