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

[modules/disk] Update to new API

Browse source 
Also, remove deprecated parameters
This commit is contained in:
Tobias Witek 2020-03-15 13:40:13 +01:00
parent 2007f8d0b9
commit 7fb626aa2c
1 changed files with 20 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
modules/core/disk.py
View file

@ -8,74 +8,44 @@ Parameters:
* 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.showSize: Show total size (defaults to yes)
* (deprecated) disk.showPercent: Show usage percentage (defaults to yes)
''' '''
import os import os
import bumblebee.input import core.module
import bumblebee.output import core.widget
import bumblebee.engine import core.input
import bumblebee.util
import util.format
class Module(core.module.Module):
def __init__(self, config=None):
super().__init__(config, core.widget.Widget(self.diskspace))
class Module(bumblebee.engine.Module):
def __init__(self, engine, config):
super(Module, self).__init__(engine, config,
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._used = 0 self._used = 0
self._left = 0 self._left = 0
self._size = 0 self._size = 0
self._percent = 0 self._percent = 0
engine.input.register_callback(self, button=bumblebee.input.LEFT_MOUSE, core.input.register(self, button=core.input.LEFT_MOUSE,
cmd='{} {}'.format(self._app, cmd='{} {}'.format(self.parameter('open', 'xdg-open'), self._path))
self._path))
def diskspace(self, widget): def diskspace(self, widget):
used_str = bumblebee.util.bytefmt(self._used) used_str = util.format.byte(self._used)
size_str = bumblebee.util.bytefmt(self._size) size_str = util.format.byte(self._size)
left_str = bumblebee.util.bytefmt(self._left) left_str = util.format.byte(self._left)
percent_str = self._percent percent_str = self._percent
sused = self.has_parameter('showUsed') return self._format.format(path=self._path,
ssize = self.has_parameter('showSize') used=used_str,
spercent = self.has_parameter('showPercent') left=left_str,
size=size_str,
percent=percent_str)
if all(not param for param in (sused, ssize, spercent)): def update(self):
return self._format.format(path=self._path,
used=used_str,
left=left_str,
size=size_str,
percent=percent_str)
else:
rv = ''
sused = bumblebee.util.asbool(self.parameter('showUsed', True))
ssize = bumblebee.util.asbool(self.parameter('showSize', True))
spercent = bumblebee.util.asbool(self.parameter('showPercent', True))
if sused:
rv = '{}{}'.format(rv, used_str)
if sused and ssize:
rv = '{}/'.format(rv)
if ssize:
rv = '{}{}'.format(rv, size_str)
if spercent:
if not sused and not ssize:
rv = '{:05.02f}%'.format(percent_str)
else:
rv = '{} ({:05.02f}%)'.format(rv, percent_str)
return rv
def update(self, widgets):
st = os.statvfs(self._path) st = os.statvfs(self._path)
self._size = st.f_blocks * st.f_frsize self._size = st.f_blocks * st.f_frsize
self._used = (st.f_blocks - st.f_bfree) * st.f_frsize self._used = (st.f_blocks - st.f_bfree) * st.f_frsize