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

Merge pull request #582 from martindoublem/sensors

Browse source 
[module] sensors2 made selective
This commit is contained in:
tobi-wan-kenobi 2020-03-27 13:31:31 +01:00 committed by GitHub
commit e3bca53ca2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 47 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
bumblebee/modules/sensors2.py
View file

@ -10,6 +10,12 @@ Parameters:
* sensors2.showfan: Enable or disable fan display (default: true) * sensors2.showfan: Enable or disable fan display (default: true)
* sensors2.showother: Enable or display "other" sensor readings (default: false) * sensors2.showother: Enable or display "other" sensor readings (default: false)
* sensors2.showname: Enable or disable show of sensor name (default: false) * sensors2.showname: Enable or disable show of sensor name (default: false)
* sensors2.chip_include: Comma-separated list of chip to include (defaults to "" will include all by default, example: "coretemp,bat")
* sensors2.chip_exlude:Comma separated list of chip to exclude (defaults to "" will include none by default)
* sensors2.field_include: Comma separated list of chip to include (defaults to "" will include all by default, example: "temp,fan")
* sensors2.field_exlude: Comma separated list of chip to exclude (defaults to "" will exclude none by default)
* sensors2.chip_field_exclude: Comma separated list of chip field to exclude (defaults to "" will exclude none by default, example: "coretemp-isa-0000.temp1,coretemp-isa-0000.fan1")
* sensors2.chip_field_include: Comma-separated list of adaper field to include (defaults to "" will include all by default)
""" """
import re import re
@ -49,6 +55,12 @@ class Module(bumblebee.engine.Module):
show_temp = bumblebee.util.asbool(self.parameter("showtemp", "true")) show_temp = bumblebee.util.asbool(self.parameter("showtemp", "true"))
show_fan = bumblebee.util.asbool(self.parameter("showfan", "true")) show_fan = bumblebee.util.asbool(self.parameter("showfan", "true"))
show_other = bumblebee.util.asbool(self.parameter("showother", "false")) show_other = bumblebee.util.asbool(self.parameter("showother", "false"))
include_chip = tuple(filter(len, self.parameter("chip_include", "").split(",")))
exclude_chip = tuple(filter(len, self.parameter("chip_exclude", "").split(",")))
include_field = tuple(filter(len, self.parameter("field_include", "").split(",")))
exclude_field = tuple(filter(len, self.parameter("field_exclude", "").split(",")))
include_chip_field = tuple(filter(len, self.parameter("chip_field_include", "").split(",")))
exclude_chip_field = tuple(filter(len, self.parameter("chip_field_exclude", "").split(",")))
if bumblebee.util.asbool(self.parameter("showcpu", "true")): if bumblebee.util.asbool(self.parameter("showcpu", "true")):
widget = bumblebee.output.Widget(full_text=self._cpu) widget = bumblebee.output.Widget(full_text=self._cpu)
@ -56,6 +68,21 @@ class Module(bumblebee.engine.Module):
widgets.append(widget) widgets.append(widget)
for adapter in self._data: for adapter in self._data:
if include_chip or exclude_chip:
if include_chip:
if any([chip not in adapter for chip in include_chip]):
continue
else:
if any([chip in adapter for chip in exclude_chip]):
continue
if include_chip_field:
try:
if any([i.split('.')[0] not in adapter for i in include_chip_field]):
continue
except:
pass
for package in self._data[adapter]: for package in self._data[adapter]:
if bumblebee.util.asbool(self.parameter("showname", "false")): if bumblebee.util.asbool(self.parameter("showname", "false")):
widget = bumblebee.output.Widget(full_text=package) widget = bumblebee.output.Widget(full_text=package)
@ -65,6 +92,26 @@ class Module(bumblebee.engine.Module):
widget.set("adapter", adapter) widget.set("adapter", adapter)
widgets.append(widget) widgets.append(widget)
for field in self._data[adapter][package]: for field in self._data[adapter][package]:
if include_field or exclude_field:
if include_field:
if any([included not in field for included in include_field]):
continue
else:
if any([excluded in field for excluded in exclude_field]):
continue
try:
if include_chip_field or exclude_chip_field:
if include_chip_field:
if any([i.split('.')[1] not in field for i in include_chip_field if i.split('.')[0] in adapter]):
continue
else:
if any([i.split('.')[1] in field for i in exclude_chip_field if i.split('.')[0] in adapter]):
continue
except:
pass
widget = bumblebee.output.Widget() widget = bumblebee.output.Widget()
widget.set("package", package) widget.set("package", package)
widget.set("field", field) widget.set("field", field)