From 7fb626aa2ca722c3f88113da597349d5a8b7f820 Mon Sep 17 00:00:00 2001
From: Tobias Witek <tobi@tobi-wan-kenobi.at>
Date: Sun, 15 Mar 2020 13:40:13 +0100
Subject: [PATCH] [modules/disk] Update to new API

Also, remove deprecated parameters
---
 modules/core/disk.py | 70 +++++++++++++-------------------------------
 1 file changed, 20 insertions(+), 50 deletions(-)

diff --git a/modules/core/disk.py b/modules/core/disk.py
index 73a6be4..b98d5ca 100644
--- a/modules/core/disk.py
+++ b/modules/core/disk.py
@@ -8,74 +8,44 @@ Parameters:
     * disk.path: Path to calculate disk usage from (defaults to /)
     * 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}%)')
-    * (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 bumblebee.input
-import bumblebee.output
-import bumblebee.engine
-import bumblebee.util
+import core.module
+import core.widget
+import core.input
+
+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._format = self.parameter('format', '{used}/{size} ({percent:05.02f}%)')
-        self._app = self.parameter('open', 'xdg-open')
 
         self._used = 0
         self._left = 0
         self._size = 0
         self._percent = 0
 
-        engine.input.register_callback(self, button=bumblebee.input.LEFT_MOUSE,
-                                       cmd='{} {}'.format(self._app,
-                                                          self._path))
-
+        core.input.register(self, button=core.input.LEFT_MOUSE,
+            cmd='{} {}'.format(self.parameter('open', 'xdg-open'), self._path))
 
     def diskspace(self, widget):
-        used_str = bumblebee.util.bytefmt(self._used)
-        size_str = bumblebee.util.bytefmt(self._size)
-        left_str = bumblebee.util.bytefmt(self._left)
+        used_str = util.format.byte(self._used)
+        size_str = util.format.byte(self._size)
+        left_str = util.format.byte(self._left)
         percent_str = self._percent
 
-        sused = self.has_parameter('showUsed')
-        ssize = self.has_parameter('showSize')
-        spercent = self.has_parameter('showPercent')
+        return self._format.format(path=self._path,
+           used=used_str,
+           left=left_str,
+           size=size_str,
+           percent=percent_str)
 
-        if all(not param for param in (sused, ssize, spercent)):
-            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):
+    def update(self):
         st = os.statvfs(self._path)
         self._size = st.f_blocks * st.f_frsize
         self._used = (st.f_blocks - st.f_bfree) * st.f_frsize