added more options to the disk module

This commit is contained in:
brunosmmm 2017-06-01 12:21:10 -04:00
parent 0e5ff2956b
commit d13ffcd9f7

View file

@ -6,6 +6,9 @@ Parameters:
* disk.warning: Warning threshold in % of disk space (defaults to 80%) * disk.warning: Warning threshold in % of disk space (defaults to 80%)
* disk.critical: Critical threshold in % of disk space (defaults ot 90%) * disk.critical: Critical threshold in % of disk space (defaults ot 90%)
* disk.path: Path to calculate disk usage from (defaults to /) * disk.path: Path to calculate disk usage from (defaults to /)
* disk.showUsed: Show used space (defaults to yes)
* disk.showSize: Show total size (defaults to yes)
* disk.showPercent: Show usage percentage (defaults to yes)
""" """
import os import os
@ -20,6 +23,9 @@ class Module(bumblebee.engine.Module):
bumblebee.output.Widget(full_text=self.diskspace) bumblebee.output.Widget(full_text=self.diskspace)
) )
self._path = self.parameter("path", "/") self._path = self.parameter("path", "/")
self._sused = self.parameter("showUsed", "yes")
self._ssize = self.parameter("showSize", "yes")
self._spercent = self.parameter("showPercent", "yes")
self._perc = 0 self._perc = 0
self._used = 0 self._used = 0
self._size = 0 self._size = 0
@ -28,10 +34,28 @@ class Module(bumblebee.engine.Module):
cmd="nautilus {}".format(self._path)) cmd="nautilus {}".format(self._path))
def diskspace(self, widget): def diskspace(self, widget):
return "{} {}/{} ({:05.02f}%)".format(self._path, if self._sused == "yes":
bumblebee.util.bytefmt(self._used), used_str = bumblebee.util.bytefmt(self._used)
bumblebee.util.bytefmt(self._size), self._perc else:
) used_str = ""
if self._ssize == "yes":
size_str = bumblebee.util.bytefmt(self._size)
else:
size_str = ""
if self._spercent == "yes":
percent_str = self._perc
else:
percent_str = ""
if self._sused != "yes" or self._ssize != "yes":
separator = ""
else:
separator = "/"
return "{} {}{}{} ({:05.02f}%)".format(self._path,
used_str,
separator,
size_str,
percent_str)
def update(self, widgets): def update(self, widgets):
st = os.statvfs(self._path) st = os.statvfs(self._path)