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

[modules/disk] Quotes conversion

Browse source
This commit is contained in:
Tobias Witek 2020-03-15 13:34:09 +01:00
parent 7aa1bc7b44
commit 2007f8d0b9
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
modules/core/disk.py
View file

@ -1,17 +1,17 @@
# pylint: disable=C0111,R0903 # pylint: disable=C0111,R0903
"""Shows free diskspace, total diskspace and the percentage of free disk space. '''Shows free diskspace, total diskspace and the percentage of free disk space.
Parameters: 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.open: Which application / file manager to launch (default xdg-open) * disk.open: Which application / file manager to launch (default xdg-open)
* disk.format: Format string, tags {path}, {used}, {left}, {size} and {percent} (defaults to "{path} {used}/{size} ({percent:05.02f}%)") * disk.format: Format string, tags {path}, {used}, {left}, {size} and {percent} (defaults to '{path} {used}/{size} ({percent:05.02f}%)')
* (deprecated) disk.showUsed: Show used space (defaults to yes) * (deprecated) disk.showUsed: Show used space (defaults to yes)
* (deprecated) disk.showSize: Show total size (defaults to yes) * (deprecated) disk.showSize: Show total size (defaults to yes)
* (deprecated) disk.showPercent: Show usage percentage (defaults to yes) * (deprecated) disk.showPercent: Show usage percentage (defaults to yes)
""" '''
import os import os
@ -25,9 +25,9 @@ class Module(bumblebee.engine.Module):
super(Module, self).__init__(engine, config, super(Module, self).__init__(engine, config,
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._format = self.parameter("format", "{used}/{size} ({percent:05.02f}%)") self._format = self.parameter('format', '{used}/{size} ({percent:05.02f}%)')
self._app = self.parameter("open", "xdg-open") self._app = self.parameter('open', 'xdg-open')
self._used = 0 self._used = 0
self._left = 0 self._left = 0
@ -35,7 +35,7 @@ class Module(bumblebee.engine.Module):
self._percent = 0 self._percent = 0
engine.input.register_callback(self, button=bumblebee.input.LEFT_MOUSE, engine.input.register_callback(self, button=bumblebee.input.LEFT_MOUSE,
cmd="{} {}".format(self._app, cmd='{} {}'.format(self._app,
self._path)) self._path))
@ -45,9 +45,9 @@ class Module(bumblebee.engine.Module):
left_str = bumblebee.util.bytefmt(self._left) left_str = bumblebee.util.bytefmt(self._left)
percent_str = self._percent percent_str = self._percent
sused = self.has_parameter("showUsed") sused = self.has_parameter('showUsed')
ssize = self.has_parameter("showSize") ssize = self.has_parameter('showSize')
spercent = self.has_parameter("showPercent") spercent = self.has_parameter('showPercent')
if all(not param for param in (sused, ssize, spercent)): if all(not param for param in (sused, ssize, spercent)):
return self._format.format(path=self._path, return self._format.format(path=self._path,
@ -56,22 +56,22 @@ class Module(bumblebee.engine.Module):
size=size_str, size=size_str,
percent=percent_str) percent=percent_str)
else: else:
rv = "" rv = ''
sused = bumblebee.util.asbool(self.parameter("showUsed", True)) sused = bumblebee.util.asbool(self.parameter('showUsed', True))
ssize = bumblebee.util.asbool(self.parameter("showSize", True)) ssize = bumblebee.util.asbool(self.parameter('showSize', True))
spercent = bumblebee.util.asbool(self.parameter("showPercent", True)) spercent = bumblebee.util.asbool(self.parameter('showPercent', True))
if sused: if sused:
rv = "{}{}".format(rv, used_str) rv = '{}{}'.format(rv, used_str)
if sused and ssize: if sused and ssize:
rv = "{}/".format(rv) rv = '{}/'.format(rv)
if ssize: if ssize:
rv = "{}{}".format(rv, size_str) rv = '{}{}'.format(rv, size_str)
if spercent: if spercent:
if not sused and not ssize: if not sused and not ssize:
rv = "{:05.02f}%".format(percent_str) rv = '{:05.02f}%'.format(percent_str)
else: else:
rv = "{} ({:05.02f}%)".format(rv, percent_str) rv = '{} ({:05.02f}%)'.format(rv, percent_str)
return rv return rv