Use GLib function for formatting size (#433)

* Use GLib function for formatting size

* use format size in indicator

---------

Co-authored-by: Stanisław <[email protected]>

Author: danirabbit

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
         meson valac sassc git
     - name: Build
       run: |
-        meson setup build
+        meson setup -Dindicator-wingpanel=enabled build
         meson compile -C build
         # Tests disabled since it starts to test live-chart and some tests fail there
         # meson test -C build --print-errorlogs
@@ -48,4 +48,4 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Lint
-      run: io.elementary.vala-lint -d .
+      run: io.elementary.vala-lint -d .

src/Indicator/Widgets/IndicatorWidget.vala

@@ -34,9 +34,9 @@ public class Monitor.IndicatorWidget : Gtk.Box {
         }
     }
 
-    public int state_bandwidth {
+    public uint64 state_bandwidth {
         set {
-            label.label = ("%s").printf (Utils.HumanUnitFormatter.string_bytes_to_human (value.to_string (), true));
+            label.label = format_size (value);
         }
     }
 

src/Utils.vala

@@ -44,65 +44,6 @@ public class Monitor.Utils.Strings {
 
 }
 
-/**
- * Static helper class for unit formatting
- * Author: Laurent Callarec @lcallarec
- */
-public class Monitor.Utils.HumanUnitFormatter {
-    const string[] SIZE_UNITS = { "B", "KiB", "MiB", "GiB", "TiB" };
-    const string[] PACKED_SIZE_UNITS = { "B", "K", "M", "G", "T" };
-    const double KFACTOR = 1024;
-
-    /**
-     * format a string of bytes to an human readable format with units
-     */
-    public static string string_bytes_to_human (string bytes, bool packed = false) {
-        string[] units;
-
-        if (packed)
-            units = HumanUnitFormatter.PACKED_SIZE_UNITS;
-        else
-            units = HumanUnitFormatter.SIZE_UNITS;
-
-        double current_size = double.parse (bytes);
-        string current_size_formatted = bytes.to_string () + units[0];
-
-        for (int i = 0; i <= units.length; i++) {
-            if (current_size < HumanUnitFormatter.KFACTOR) {
-                return GLib.Math.round (current_size).to_string () + units[i];
-            }
-            current_size = current_size / HumanUnitFormatter.KFACTOR;
-        }
-
-        return current_size_formatted;
-    }
-
-    public static string double_bytes_to_human (double bytes) {
-        string units = _("B");
-
-        // convert to MiB if needed
-        if (bytes > 1024.0) {
-            bytes /= 1024.0;
-            units = _("KiB");
-        }
-
-        // convert to GiB if needed
-        if (bytes > 1024.0) {
-            bytes /= 1024.0;
-            units = _("MiB");
-        }
-
-        if (bytes > 1024.0) {
-            bytes /= 1024.0;
-            units = _("GiB");
-        }
-
-        return "%.1f %s".printf (bytes, units);
-    }
-
-}
-
-
 public class Monitor.Utils.Colors : Object {
 
     public const string STRAWBERRY_100 = "#ff8c82";

src/Views/ProcessView/ProcessInfoView/ProcessInfoIOStats.vala

@@ -61,9 +61,9 @@ public class Monitor.ProcessInfoIOStats : Gtk.Grid {
     }
 
     public void update (Process process) {
-        write_bytes_label.set_text (Utils.HumanUnitFormatter.double_bytes_to_human (process.io.write_bytes));
-        read_bytes_label.set_text (Utils.HumanUnitFormatter.double_bytes_to_human (process.io.read_bytes));
-        cancelled_write_bytes_label.set_text (Utils.HumanUnitFormatter.double_bytes_to_human (process.io.cancelled_write_bytes));
+        write_bytes_label.set_text (format_size ((uint64) process.io.write_bytes, IEC_UNITS));
+        read_bytes_label.set_text (format_size ((uint64) process.io.read_bytes, IEC_UNITS));
+        cancelled_write_bytes_label.set_text (format_size ((uint64) process.io.cancelled_write_bytes, IEC_UNITS));
     }
 
     private Gtk.Label create_label (string text) {

src/Views/SystemView/SystemMemoryView.vala

@@ -62,13 +62,13 @@ public class Monitor.SystemMemoryView : Monitor.WidgetResource {
         // memory_chart.update (3, memory.shared_percentage + memory.buffer_percentage + memory.cached_percentage);
         // memory_chart.update (3, memory.shared_percentage + memory.buffer_percentage + memory.cached_percentage + memory.locked_percentage);
 
-        memory_total_label.set_text (("%s").printf (Utils.HumanUnitFormatter.double_bytes_to_human (memory.total)));
-        memory_used_label.set_text (("%s").printf (Utils.HumanUnitFormatter.double_bytes_to_human (memory.used)));
-        memory_buffered_label.set_text (("%s").printf (Utils.HumanUnitFormatter.double_bytes_to_human (memory.buffer)));
-        memory_cached_label.set_text (("%s").printf (Utils.HumanUnitFormatter.double_bytes_to_human (memory.cached)));
-        memory_locked_label.set_text (("%s").printf (Utils.HumanUnitFormatter.double_bytes_to_human (memory.locked)));
+        memory_total_label.set_text (format_size ((uint64) memory.total, IEC_UNITS));
+        memory_used_label.set_text (format_size ((uint64) memory.used, IEC_UNITS));
+        memory_buffered_label.set_text (format_size ((uint64) memory.buffer, IEC_UNITS));
+        memory_cached_label.set_text (format_size ((uint64) memory.cached, IEC_UNITS));
+        memory_locked_label.set_text (format_size ((uint64) memory.locked, IEC_UNITS));
 
-        memory_shared_label.set_text (("%s").printf (Utils.HumanUnitFormatter.double_bytes_to_human (memory.shared)));
+        memory_shared_label.set_text (format_size ((uint64) memory.shared, IEC_UNITS));
     }
 
 }

src/Views/SystemView/SystemNetworkView.vala

@@ -52,8 +52,8 @@ public class Monitor.SystemNetworkView : Gtk.Grid {
         double up_bytes = network.bytes_out;
         double down_bytes = network.bytes_in;
         if (up_bytes >= 0 && down_bytes >= 0) {
-            network_download_label.set_text (("%s/s").printf (Utils.HumanUnitFormatter.string_bytes_to_human (down_bytes.to_string ())));
-            network_upload_label.set_text (("%s/s").printf (Utils.HumanUnitFormatter.string_bytes_to_human (up_bytes.to_string ())));
+            network_download_label.set_text (("%s/s").printf (format_size ((uint64) down_bytes, IEC_UNITS)));
+            network_upload_label.set_text (("%s/s").printf (format_size ((uint64) up_bytes, IEC_UNITS)));
             network_chart.update (0, up_bytes);
             network_chart.update (1, down_bytes);
         }

src/Views/SystemView/SystemStorageView.vala

@@ -80,8 +80,8 @@ public class Monitor.SystemStorageView : Gtk.Grid {
         drive_name_label.margin_bottom = 0;
         drive_name_label.halign = Gtk.Align.START;
 
-        string size_string = Utils.HumanUnitFormatter.double_bytes_to_human (size);
-        string used_string = Utils.HumanUnitFormatter.double_bytes_to_human ((size - free));
+        string size_string = format_size ((uint64) size, IEC_UNITS);
+        string used_string = format_size ((uint64) (size - free), IEC_UNITS);
 
         string drive_block_name_and_size_string = "%s 𐄁 %s / %s".printf (device, used_string, size_string);
 
@@ -123,8 +123,8 @@ public class Monitor.SystemStorageView : Gtk.Grid {
         double up_bytes = storage.bytes_read;
         double down_bytes = storage.bytes_write;
         if (up_bytes >= 0 && down_bytes >= 0) {
-            storage_write_label.set_text (("%s/s").printf (Utils.HumanUnitFormatter.string_bytes_to_human (down_bytes.to_string ())));
-            storage_read_label.set_text (("%s/s").printf (Utils.HumanUnitFormatter.string_bytes_to_human (up_bytes.to_string ())));
+            storage_write_label.set_text (("%s/s").printf (format_size ((uint64) down_bytes, IEC_UNITS)));
+            storage_read_label.set_text (("%s/s").printf (format_size ((uint64) up_bytes, IEC_UNITS)));
             storage_chart.update (0, up_bytes);
             storage_chart.update (1, down_bytes);
         }

src/Widgets/Statusbar/Statusbar.vala

@@ -87,7 +87,10 @@ public class Monitor.Statusbar : Gtk.ActionBar {
         string cpu_tooltip_text = ("%.2f %s").printf (sysres.cpu_frequency, _("GHz"));
         cpu_usage_label.tooltip_text = cpu_tooltip_text;
 
-        string memory_tooltip_text = ("%s / %s").printf (Utils.HumanUnitFormatter.double_bytes_to_human (sysres.memory_used), Utils.HumanUnitFormatter.double_bytes_to_human (sysres.memory_total));
+        string memory_tooltip_text = ("%s / %s").printf (
+            format_size ((uint64) sysres.memory_used, IEC_UNITS),
+            format_size ((uint64) sysres.memory_total, IEC_UNITS)
+        );
         memory_usage_label.tooltip_text = memory_tooltip_text;
 
         // The total amount of the swap is 0 when it is unavailable