[config] Allow parameter passing via commandline

Allow the user to specify arbitrary configuration parameters from the
commandline and evaluate those in the modules (and elsewhere). Re-enable
the CPU module as a first showcase of this functionality.
This commit is contained in:
Tobias Witek 2016-11-05 12:28:05 +01:00
parent 353c47d76e
commit 18d7e1befb
4 changed files with 29 additions and 12 deletions

View file

@ -11,22 +11,27 @@ def description():
return "Displays CPU utilization across all CPUs."
class Module(bumblebee.module.Module):
def __init__(self, output, args):
super(Module, self).__init__(args)
def __init__(self, output, config):
super(Module, self).__init__(output, config)
self._perc = psutil.cpu_percent(percpu=False)
self._config = config
output.add_callback(module=self.__module__, button=1,
cmd="gnome-system-monitor")
# TODO
# output.add_callback(module=self.__module__, button=1,
# cmd="gnome-system-monitor")
def data(self):
def widgets(self):
self._perc = psutil.cpu_percent(percpu=False)
return "{:05.02f}%".format(self._perc)
return [
bumblebee.output.Widget(self,
"{:05.02f}%".format(self._perc)
)
]
def warning(self):
return self._perc > 70
return self._perc > self._config.parameter("cpu.warning", 70)
def critical(self):
return self._perc > 80
return self._perc > self._config.parameter("cpu.critical", 80)
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4