l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[core] add debugging around click events

Browse source 
log commandline outputs and errors. allow input handlers to be
configured as "waiting" for debugging purposes.

see #628
This commit is contained in:
tobi-wan-kenobi 2020-05-16 15:16:23 +02:00
parent 02a80840a1
commit a697500491
3 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bumblebee_status/core/input.py
View file

@ -36,20 +36,20 @@ def __event_id(obj_id, button):
return "{}::{}".format(obj_id, button_name(button)) return "{}::{}".format(obj_id, button_name(button))
def __execute(cmd): def __execute(cmd, wait=False):
try: try:
util.cli.execute(cmd, wait=False, shell=True) util.cli.execute(cmd, wait=wait, shell=True)
except Exception as e: except Exception as e:
logging.error("failed to invoke callback: {}".format(e)) logging.error("failed to invoke callback: {}".format(e))
def register(obj, button=None, cmd=None): def register(obj, button=None, cmd=None, wait=False):
event_id = __event_id(obj.id if obj is not None else "", button) event_id = __event_id(obj.id if obj is not None else "", button)
logging.debug("registering callback {}".format(event_id)) logging.debug("registering callback {}".format(event_id))
if callable(cmd): if callable(cmd):
core.event.register(event_id, cmd) core.event.register(event_id, cmd)
else: else:
core.event.register(event_id, lambda _: __execute(cmd)) core.event.register(event_id, lambda _: __execute(cmd, wait))
def trigger(event): def trigger(event):

11
bumblebee_status/core/module.py
View file

@ -7,6 +7,8 @@ import core.input
import core.widget import core.widget
import core.decorators import core.decorators
import util.format
try: try:
error = ModuleNotFoundError("") error = ModuleNotFoundError("")
except Exception as e: except Exception as e:
@ -211,7 +213,14 @@ class Module(core.input.Object):
] ]
for action in actions: for action in actions:
if self.parameter(action["name"]): if self.parameter(action["name"]):
core.input.register(self, action["id"], self.parameter(action["name"])) core.input.register(
self,
action["id"],
self.parameter(action["name"]),
util.format.asbool(
self.parameter("{}-wait".format(action["name"]), False)
),
)
class Error(Module): class Error(Module):

2
bumblebee_status/util/cli.py
View file

@ -45,10 +45,12 @@ def execute(
out, _ = proc.communicate() out, _ = proc.communicate()
if proc.returncode != 0: if proc.returncode != 0:
err = "{} exited with code {}".format(cmd, proc.returncode) err = "{} exited with code {}".format(cmd, proc.returncode)
logging.warning(err)
if ignore_errors: if ignore_errors:
return (proc.returncode, err) if return_exitcode else err return (proc.returncode, err) if return_exitcode else err
raise RuntimeError(err) raise RuntimeError(err)
res = out.decode("utf-8") res = out.decode("utf-8")
logging.debug(res)
return (proc.returncode, res) if return_exitcode else res return (proc.returncode, res) if return_exitcode else res
return (0, "") if return_exitcode else "" return (0, "") if return_exitcode else ""