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

Merge pull request #733 from martindoublem/main

Browse source 
[module] Improved smartstatus with combined_singles
This commit is contained in:
tobi-wan-kenobi 2020-11-06 12:36:33 +01:00 committed by GitHub
commit 0fc1782e0b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bumblebee_status/modules/contrib/smartstatus.py
View file

@ -10,7 +10,7 @@ Requires the following executables:
* smartctl * smartctl
Parameters: Parameters:
* smartstatus.display: how to display (defaults to 'combined', other choices: 'seperate' or 'singles') * smartstatus.display: how to display (defaults to 'combined', other choices: 'combined_singles', 'seperate' or 'singles')
* smartstatus.drives: in the case of singles which drives to display, separated comma list value, multiple accepted (defaults to 'sda', example:'sda,sdc') * smartstatus.drives: in the case of singles which drives to display, separated comma list value, multiple accepted (defaults to 'sda', example:'sda,sdc')
* smartstatus.show_names: boolean in the form of "True" or "False" to show the name of the drives in the form of sda, sbd, combined or none at all. * smartstatus.show_names: boolean in the form of "True" or "False" to show the name of the drives in the form of sda, sbd, combined or none at all.
""" """
@ -38,7 +38,7 @@ class Module(core.module.Module):
self.create_widgets() self.create_widgets()
def create_widgets(self): def create_widgets(self):
if self.display == "combined": if self.display == "combined" or self.display == "combined_singles":
widget = self.add_widget() widget = self.add_widget()
widget.set("device", "combined") widget.set("device", "combined")
widget.set("assessment", self.combined()) widget.set("assessment", self.combined())
@ -81,6 +81,8 @@ class Module(core.module.Module):
def combined(self): def combined(self):
for device in self.devices: for device in self.devices:
if self.display == "combined_singles" and device not in self.drives:
continue
result = self.smart(device) result = self.smart(device)
if result == "Fail": if result == "Fail":
return "Fail" return "Fail"