system-monitor-graph@rcassani: Add a battery system monitor graph (#1766)

---------

Co-authored-by: rcassani <raymundo.cassani@gmail.com>

Author: tidotua

system-monitor-graph@rcassani/files/system-monitor-graph@rcassani/desklet.js

@@ -19,6 +19,17 @@ const KIB_TO_B = 1024;      // 1 KiB = 1,024 B
 const UUID = "system-monitor-graph@rcassani";
 const DESKLET_PATH = imports.ui.deskletManager.deskletMeta[UUID].path;
 
+// Borrowed from battery@schorschii
+const UPowerInterface = `<node>
+  <interface name="org.freedesktop.UPower.Device">
+    <property name="TimeToEmpty" type="x" access="read" />
+    <property name="TimeToFull" type="x" access="read" />
+  </interface>
+</node>`;
+
+const UPowerProxy = Gio.DBusProxy.makeProxyWrapper(UPowerInterface);
+const UPowerBusName = "org.freedesktop.UPower";
+
 Gettext.bindtextdomain(UUID, GLib.get_home_dir() + "/.local/share/locale");
 
 function _(str) {
@@ -48,6 +59,7 @@ SystemMonitorGraph.prototype = {
         this.settings.bindProperty(Settings.BindingDirection.IN, "data-prefix-gpumem", "data_prefix_gpumem", this.on_setting_changed);
         this.settings.bindProperty(Settings.BindingDirection.IN, "data-prefix-network", "data_prefix_network", this.on_setting_changed);
         this.settings.bindProperty(Settings.BindingDirection.IN, "network-interface", "network_interface", this.on_setting_changed);
+        this.settings.bindProperty(Settings.BindingDirection.IN, "battery-name", "battery_name", this.on_setting_changed);
         this.settings.bindProperty(Settings.BindingDirection.IN, "filesystem", "filesystem", this.on_setting_changed);
         this.settings.bindProperty(Settings.BindingDirection.IN, "filesystem-label", "filesystem_label", this.on_setting_changed);
         this.settings.bindProperty(Settings.BindingDirection.IN, "gpu-manufacturer", "gpu_manufacturer", this.on_setting_changed);
@@ -68,6 +80,7 @@ SystemMonitorGraph.prototype = {
         this.settings.bindProperty(Settings.BindingDirection.IN, "line-color-gpu", "line_color_gpu", this.on_setting_changed);
         this.settings.bindProperty(Settings.BindingDirection.IN, "line-color-network-down", "line_color_network_down", this.on_setting_changed);
         this.settings.bindProperty(Settings.BindingDirection.IN, "line-color-network-up", "line_color_network_up", this.on_setting_changed);
+        this.settings.bindProperty(Settings.BindingDirection.IN, "line-color-battery", "line_color_battery", this.on_setting_changed);
 
         // initialize desklet GUI
         this.setupUI();
@@ -122,6 +135,11 @@ SystemMonitorGraph.prototype = {
             this.net_down_speed = 0;
             this.net_up_speed = 0;
             this.net_max_scale = 1; // Auto-scaling for network graph
+            // battery values
+            this.battery_percent  = NaN;
+            this.battery_capacity = NaN;
+            this.battery_status   = "";
+            this.battery_time     = "";
 
             // set colors
             switch (this.type) {
@@ -145,6 +163,9 @@ SystemMonitorGraph.prototype = {
                   this.line_color_down = this.line_color_network_down;
                   this.line_color_up = this.line_color_network_up;
                   break;
+              case "battery":
+                  this.line_color = this.line_color_battery;
+                  break;
             }
             this.first_run = false;
         }
@@ -296,6 +317,18 @@ SystemMonitorGraph.prototype = {
               text2 = "";
               text3 = "↓ " + down_speed_formatted + "  ↑ " + up_speed_formatted;
               break;
+
+          case "battery":
+              this.get_battery_use();
+              value = this.battery_capacity;
+              text1 = _("Battery");
+              text2 = this.battery_percent + "%";
+              let prefix = (this.battery_status == "Charging") ? "⚡ " : (this.battery_percent <= 20 ? "🪫 " : "🔋 ");
+              text3 = (this.battery_status == "Full") ? "🔋 " + _("Fully charged") :
+                (this.battery_status == "Not charging") ? "🔌 " + _("Not charging") :
+                (this.battery_status == "" || this.battery_status == "Unknown") ? "" :
+                prefix + this.battery_time + _(" hrs");
+              break;
         }
 
         // For non-network types, concatenate new value to the main values array
@@ -963,6 +996,58 @@ SystemMonitorGraph.prototype = {
         }
         GLib.free(contents);
       });
-    }
+    },
+
+
+    get_battery_use: function() {
+        // Sysfs directory for battery info
+        let battery_dir = "/sys/class/power_supply/" + this.battery_name + "/";
+        // D-Bus object path for the battery device in the UPower daemon
+        let bus_path = "/org/freedesktop/UPower/devices/battery_" + this.battery_name;
+
+        // File capacity contains the battery charge percentage, integer number from 0 to 100
+        Gio.file_new_for_path(battery_dir + "capacity").load_contents_async(null, (file, response) => {
+            try {
+                let [success, contents, tag] = file.load_contents_finish(response);
+                if (success) {
+                    let percent = parseInt(ByteArray.toString(contents));
+                    this.battery_percent = percent >= 100 ? 100 : percent;
+                    this.battery_capacity = this.battery_percent / 100.0;
+                }
+                GLib.free(contents);
+            } catch(error) {
+                global.log('Battery capacity file read error: ' + error.toString());
+            }
+        });
+
+        // File status contains the battery charge status, string
+        Gio.file_new_for_path(battery_dir + "status").load_contents_async(null, (file, response) => {
+            try {
+                let [success, contents, tag] = file.load_contents_finish(response);
+                if (success) {
+                    this.battery_status = ByteArray.toString(contents).trim();
+                }
+                GLib.free(contents);
+            } catch(error) {
+                global.log('Battery status file read error: ' + error.toString());
+            }
+        });
+
+        try {
+            let upower_proxy = new UPowerProxy(Gio.DBus.system, UPowerBusName, bus_path);
+            let time_sec = (this.battery_status == "Charging") ? upower_proxy.TimeToFull : upower_proxy.TimeToEmpty;
+            this.battery_time = this.formatTime(time_sec);
+        } catch(error) {
+            global.log('Battery time file open error: ' + error.toString());
+        }
+    },
+
+    formatTime: function(timeSec) {
+        let totalMinutes = Math.round(timeSec / 60);
+        let minutes = String(Math.floor(totalMinutes % 60)).padStart(2, '0');
+        let hours = String(Math.floor(totalMinutes / 60)).padStart(2, '0');
+        let result = `${hours}:${minutes}`;
+        return (result == "00:00") ? "--:--" : result;
+	}
 
 };

system-monitor-graph@rcassani/files/system-monitor-graph@rcassani/po/ca.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-desklets/"
 "issues\n"
-"POT-Creation-Date: 2025-08-27 21:38-0400\n"
+"POT-Creation-Date: 2026-03-19 16:11+0200\n"
 "PO-Revision-Date: 2025-09-29 04:41+0200\n"
 "Last-Translator: Daniel <d3vf4n@tutanota.com>\n"
 "Language-Team: \n"
@@ -20,82 +20,99 @@ msgstr ""
 "X-Generator: Poedit 3.6\n"
 
 #. settings-schema.json->type->options
-#. desklet.js:183
+#. desklet.js:204
 msgid "CPU"
 msgstr "CPU"
 
-#. desklet.js:194 desklet.js:212 desklet.js:232 desklet.js:273 desklet.js:547
+#. desklet.js:215 desklet.js:233 desklet.js:253 desklet.js:294 desklet.js:580
 msgid "GB"
 msgstr "GB"
 
-#. desklet.js:197 desklet.js:215 desklet.js:235 desklet.js:276 desklet.js:561
+#. desklet.js:218 desklet.js:236 desklet.js:256 desklet.js:297 desklet.js:594
 msgid "GiB"
 msgstr "GiB"
 
 #. settings-schema.json->type->options
-#. desklet.js:199
+#. desklet.js:220
 msgid "RAM"
 msgstr "RAM"
 
 #. settings-schema.json->type->options
-#. desklet.js:217
+#. desklet.js:238
 msgid "Swap"
 msgstr "Swap"
 
-#. desklet.js:240
+#. desklet.js:261
 msgid "free of"
 msgstr "lliure de"
 
-#. desklet.js:256
+#. desklet.js:277
 msgid "GPU Usage"
 msgstr "Ús de GPU"
 
-#. desklet.js:278
+#. desklet.js:299
 msgid "GPU Memory"
 msgstr "Memòria de la GPU"
 
 #. settings-schema.json->type->options
-#. desklet.js:290
+#. desklet.js:311
 msgid "Network"
 msgstr "Xarxa"
 
-#. desklet.js:518 desklet.js:541
+#. settings-schema.json->type->options
+#. desklet.js:324
+msgid "Battery"
+msgstr ""
+
+#. desklet.js:327
+msgid "Fully charged"
+msgstr ""
+
+#. desklet.js:328
+msgid "Not charging"
+msgstr ""
+
+#. desklet.js:330
+msgid " hrs"
+msgstr ""
+
+#. desklet.js:551 desklet.js:574
 msgid "b"
 msgstr "b"
 
-#. desklet.js:520 desklet.js:555 desklet.js:569
+#. desklet.js:553 desklet.js:588 desklet.js:602
 msgid "B"
 msgstr "B"
 
-#. desklet.js:533
+#. desklet.js:566
 msgid "Gb"
 msgstr "Gb"
 
-#. desklet.js:536
+#. desklet.js:569
 msgid "Mb"
 msgstr "Mb"
 
-#. desklet.js:539
+#. desklet.js:572
 msgid "Kb"
 msgstr "Kb"
 
-#. desklet.js:550
+#. desklet.js:583
 msgid "MB"
 msgstr "MB"
 
-#. desklet.js:553
+#. desklet.js:586
 msgid "KB"
 msgstr "KB"
 
-#. desklet.js:564
+#. desklet.js:597
 msgid "MiB"
 msgstr "MiB"
 
-#. desklet.js:567
+#. desklet.js:600
 msgid "KiB"
 msgstr "KiB"
 
-#. desklet.js:844 desklet.js:882
+#. desklet.js:877 desklet.js:915
 msgid "Error executing nvidia-smi command."
 msgstr "Error executant l'ordre nvidia-smi."
 
@@ -194,6 +211,15 @@ msgstr ""
 "Deixeu-ho en blanc per a monitorar totes les interfícies. Per exemple: eth0, "
 "wlan0, enp0s3"
 
+#. settings-schema.json->battery-name->description
+#, fuzzy
+msgid "Name of battery name to monitor"
+msgstr "Interfície de xarxa a monitorar"
+
+#. settings-schema.json->battery-name->tooltip
+msgid "Check battery name in /sys/class/power_supply/ Examples: BAT0, BAT1"
+msgstr ""
+
 #. settings-schema.json->filesystem->description
 msgid "Filesystem to monitor"
 msgstr "Sistema de fitxers a monitorar"
@@ -350,6 +376,7 @@ msgstr "Color de la línia de la CPU"
 #. settings-schema.json->line-color-gpu->tooltip
 #. settings-schema.json->line-color-network-down->tooltip
 #. settings-schema.json->line-color-network-up->tooltip
+#. settings-schema.json->line-color-battery->tooltip
 msgid "RGB or RGBA. Alpha is ignored"
 msgstr "RGB o RGBA. El canal alpha s'ignora"
 
@@ -377,6 +404,11 @@ msgstr "Color de la línia de la velocitat de baixada"
 msgid "Line color Network Upload"
 msgstr "Color de la línia de la velocitat de pujada"
 
+#. settings-schema.json->line-color-battery->description
+#, fuzzy
+msgid "Line color Battery"
+msgstr "Color de la línia de la memòria d'intercanvi (Swap)"
+
 #. settings-schema.json->midline-color->description
 msgid "Grid color"
 msgstr "Color de la graella"