[modules] Add CPU module

Also, change minwidth from theme.minwidth to widget property
This commit is contained in:
Tobias Witek 2020-03-06 14:31:29 +01:00
parent 51faef9fd4
commit d2e8057141
6 changed files with 48 additions and 3 deletions

View file

@ -8,7 +8,7 @@ def scrollable(func):
return text return text
width = widget.get('theme.width', util.format.asint(module.parameter('width', 30))) width = widget.get('theme.width', util.format.asint(module.parameter('width', 30)))
if util.format.asbool(module.parameter('scrolling.makewide', True)): if util.format.asbool(module.parameter('scrolling.makewide', True)):
widget.set('theme.minwidth', 'A'*width) widget.minwidth = 'A'*width
if width < 0 or len(text) <= width: if width < 0 or len(text) <= width:
return text return text

View file

@ -5,6 +5,11 @@ import core.input
import core.widget import core.widget
import core.decorators import core.decorators
try:
error = ModuleNotFoundError('')
except Exception as e:
ModuleNotFoundError = Exception
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
def load(module_name, config=None): def load(module_name, config=None):

View file

@ -86,7 +86,7 @@ class i3(object):
'full_text': self.__decorate(module, widget, text), 'full_text': self.__decorate(module, widget, text),
'color': self._theme.fg(widget), 'color': self._theme.fg(widget),
'background': self._theme.bg(widget), 'background': self._theme.bg(widget),
'min_width': widget.get('theme.minwidth'), 'min_width': self.__decorate(module, widget, widget.minwidth),
}) })
return [attr] return [attr]

View file

@ -9,6 +9,8 @@ class Widget(util.store.Store, core.input.Object):
self._module = module self._module = module
self._name = name self._name = name
self.minwidth = None
def name(self): def name(self):
return self._name return self._name

View file

@ -4,6 +4,6 @@
- bumblebee.engine.Module has been replaced with core.module.Module - bumblebee.engine.Module has been replaced with core.module.Module
- module __init__ has less parameters - module __init__ has less parameters
- super() works differently - super() works differently
- register_callback is now core.input.register - engine.input.register_callback is now core.input.register
- update() doesn't have a list of widgets anymore - update() doesn't have a list of widgets anymore

38
modules/core/cpu.py Normal file
View file

@ -0,0 +1,38 @@
# pylint: disable=C0111,R0903
'''Displays CPU utilization across all CPUs.
Parameters:
* cpu.warning : Warning threshold in % of CPU usage (defaults to 70%)
* cpu.critical: Critical threshold in % of CPU usage (defaults to 80%)
* cpu.format : Format string (defaults to '{:.01f}%')
'''
import psutil
import core.module
import core.widget
import core.input
class Module(core.module.Module):
def __init__(self, config=None):
super().__init__(config, core.widget.Widget(self.utilization))
self.widget().minwidth = self._format.format(100.0-10e-20)
self._utilization = psutil.cpu_percent(percpu=False)
core.input.register(self, button=core.input.LEFT_MOUSE,
cmd='gnome-system-monitor')
@property
def _format(self):
return self.parameter('format', '{:.01f}%')
def utilization(self, _):
return self._format.format(self._utilization)
def update(self):
self._utilization = psutil.cpu_percent(percpu=False)
def state(self, _):
return self.threshold_state(self._utilization, 70, 80)
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4