system-monitor-graph@rcassani: Address fan review feedback

Author: karthikmudaliarX

system-monitor-graph@rcassani/README.md

@@ -10,13 +10,13 @@ Four instances of the Desklet in action.
 This project has been inspired from other Desklets such as [Disk Space](https://cinnamon-spices.linuxmint.com/desklets/view/39), [CPU Load](https://cinnamon-spices.linuxmint.com/desklets/view/44), [Simple system monitor](https://cinnamon-spices.linuxmint.com/desklets/view/29), [Network usage monitor](https://cinnamon-spices.linuxmint.com/desklets/view/15), [Top](https://cinnamon-spices.linuxmint.com/desklets/view/41), and the  [Rainmeter Win10 Widgets](https://win10widgets.com/).
 
 ## Features
-### Variables to monitor (v2.0 - July 2025)
+### Variables to monitor (v2.2 - July 2026)
 
 | System variable | Description |
 | -----------     | ----------- |
 | CPU             | CPU usage in % |
 | CPU Temperature | CPU temperature in C or F |
-| CPU Fan Speed   | Fan speed in RPM, on/off status, and activity history when exposed by hwmon |
+| CPU Fan         | CPU fan speed in RPM and on/off status |
 | RAM             | Used RAM as % of total, and in GB |
 | Swap            | Used Swap space as % of total, and in GB |
 | HDD             | % of I/O activity, and free and total space in the filesystem (partition)  indicated by the user |
@@ -30,12 +30,6 @@ Each variable is calculated every `Refresh interval` seconds (Min. 1 s, Max. 60
 GPU graphs work for NVIDIA, discrete AMD and built-in AMD.
 Fan monitoring uses CPU-labelled sensors and known laptop cooling drivers. It avoids guessing from unrelated unlabelled fans, and reports when an identifiable CPU fan is not detected.
 
-<p align="center">
-<img src="fan-speed-on.png" width="350" alt="CPU fan speed graph showing 522 RPM and On">
-<img src="fan-speed-off.png" width="350" alt="CPU fan speed graph showing 0 RPM and Off"><br>
-CPU fan speed history while the fan is running and stopped.
-</p>
-
 ### Customizable visual elements
 <p align="center">
 <img src="https://cinnamon-spices.linuxmint.com/git/desklets/system-monitor-graph@rcassani/settings.png" width="700" align="middle"><br>
@@ -65,6 +59,11 @@ Another screenshot.
 Screenshot with temperature and battery graphs.
 </p>
 
+<p align="center">
+<img src="https://cinnamon-spices.linuxmint.com/git/desklets/system-monitor-graph@rcassani/screenshot5.png" width="700" align="middle"><br>
+CPU fan speed history while the fan is running and stopped.
+</p>
+
 ## TODO
 - [x] Add network
 - [x] Battery levels for main battery (laptop)

system-monitor-graph@rcassani/fan-speed-off.png

@@ -190,6 +190,7 @@ SystemMonitorGraph.prototype = {
             // temperature values
             this.cpu_temperature = NaN;
             this.gpu_temperature = NaN;
+            // cpu fan values
             this.cpu_fan_rpm = NaN;
             this.cpu_fan_file = "";
             this.cpu_fan_discovery_complete = false;
@@ -289,7 +290,7 @@ SystemMonitorGraph.prototype = {
                       // scale CPU temperature based on [CPU_TEMP_MIN, CPU_TEMP_MAX]
                       value = 1.0 * (this.cpu_temperature - CPU_TEMP_MIN) / (CPU_TEMP_MAX - CPU_TEMP_MIN);
                       value = value < 0 ? 0 : value > 1 ? 1 : value;
-                      text1 = _("CPU Temp");
+                      text1 = _("CPU Temperature");
                       if (this.temperature_units_cpu == "C") {
                           text2 = this.cpu_temperature.toString() + "°C";
                       } else if (this.temperature_units_cpu == "F") {
@@ -300,11 +301,11 @@ SystemMonitorGraph.prototype = {
                   case "fan":
                       this.get_cpu_fan_speed(this.cpu_fan_file);
                       value = isNaN(this.cpu_fan_rpm) ? 0 : this.cpu_fan_rpm;
-                      text1 = _("CPU Fan Speed");
+                      text1 = _("CPU Fan");
                       text2_size = Math.max(1, text2_size - 1);
                       if (!isNaN(this.cpu_fan_rpm)) {
                           if (this.cpu_fan_rpm >= 1) {
-                              text2 = this.cpu_fan_rpm + " RPM";
+                              text2 = this.cpu_fan_rpm + " " + _("RPM");
                               text3 = "🟢 " + _("On");
                           } else {
                               text3 = "🔴 " + _("Off");
@@ -1193,63 +1194,60 @@ SystemMonitorGraph.prototype = {
         });
     },
 
-    get_cpu_fan_file: function(callback) {
+    get_cpu_fan_file: function(excluded_file, callback) {
         // Prefer explicitly labelled CPU fans, then known laptop cooling drivers.
         // Do not guess from an unrelated, unlabelled hwmon fan.
-        let script = `
-            for label_file in /sys/class/hwmon/hwmon*/fan*_label; do
-                [ -r "$label_file" ] || continue
-                label=$(cat "$label_file" 2>/dev/null) || continue
-                case "$label" in
-                    *CPU*|*cpu*|*Processor*|*processor*)
-                        fan_file="\${label_file%_label}_input"
-                        [ -r "$fan_file" ] && { printf '%s' "$fan_file"; exit; }
-                        ;;
-                esac
-            done
-            for name_file in /sys/class/hwmon/hwmon*/name; do
-                [ -r "$name_file" ] || continue
-                driver=$(cat "$name_file" 2>/dev/null) || continue
-                case "$driver" in
-                    dell_smm|thinkpad)
-                        hwmon_dir=\${name_file%/name}
-                        fan_file="$hwmon_dir/fan1_input"
-                        [ -r "$fan_file" ] && { printf '%s' "$fan_file"; exit; }
-                        ;;
-                esac
-            done
-        `;
-        spawnAsyncWithOutput(['/bin/sh', '-c', script], (success, output) => {
+        let argv = ['/bin/sh', '-c', "for fan_file in $({ grep -s -i -l -d skip -E 'cpu|processor' /sys/class/hwmon/hwmon*/fan*_label | sed 's/_label/_input/'; grep -s -l -d skip -E '^(dell_smm|thinkpad)$' /sys/class/hwmon/hwmon*/name | sed 's#/name#/fan1_input#'; }); do [ \"$fan_file\" = \"$1\" ] && continue; [ -r \"$fan_file\" ] && { printf '%s' \"$fan_file\"; break; }; done", 'cpu-fan-discovery', excluded_file];
+        spawnAsyncWithOutput(argv, (success, output) => {
             callback(success && output ? output.trim() : "");
         });
     },
 
-    rediscover_cpu_fan: function() {
-        // Clear a stale hwmon path first. If discovery finds nothing, the fan
-        // graph reports that no sensor was detected instead of retrying forever.
+    rediscover_cpu_fan: function(failed_file = "") {
+        // Clear a stale hwmon path first. Initial discovery retries with bounded
+        // backoff; a failed known path is excluded to avoid looping every refresh.
+        if (this.cpu_fan_discovery_in_progress) return;
+        if (this.cpu_fan_retry_delay == null) this.cpu_fan_retry_delay = 5;
+        this.cpu_fan_discovery_in_progress = true;
+        this.cpu_fan_retry_if_missing = failed_file == "";
         this.cpu_fan_file = "";
         this.cpu_fan_rpm = NaN;
         this.cpu_fan_discovery_complete = false;
-        this.get_cpu_fan_file((result) => {
+        this.get_cpu_fan_file(failed_file, (result) => {
             this.cpu_fan_file = result;
             this.cpu_fan_discovery_complete = true;
+            this.cpu_fan_discovery_in_progress = false;
+            if (result == "" && this.cpu_fan_retry_if_missing) {
+                this.cpu_fan_next_discovery_time = GLib.get_monotonic_time()
+                    + (this.cpu_fan_retry_delay * GLib.USEC_PER_SEC);
+                this.cpu_fan_retry_delay = Math.min(this.cpu_fan_retry_delay * 2, 300);
+            } else if (result != "") {
+                this.cpu_fan_retry_delay = 5;
+                this.cpu_fan_next_discovery_time = 0;
+            }
         });
     },
 
     get_cpu_fan_speed: function(fan_file) {
-        if(fan_file == null || fan_file == "") return;
+        if(fan_file == null || fan_file == "") {
+            if (this.cpu_fan_discovery_complete && this.cpu_fan_retry_if_missing
+                && GLib.get_monotonic_time() >= this.cpu_fan_next_discovery_time) {
+                this.rediscover_cpu_fan();
+            }
+            return;
+        }
         Gio.file_new_for_path(fan_file).load_contents_async(null, (file, response) => {
             try {
                 let [success, contents, tag] = file.load_contents_finish(response);
                 if (success) {
                     let rpm = parseInt(ByteArray.toString(contents).trim());
                     this.cpu_fan_rpm = isNaN(rpm) ? NaN : Math.max(0, rpm);
                 } else {
-                    this.rediscover_cpu_fan();
+                    this.rediscover_cpu_fan(fan_file);
                 }
                 GLib.free(contents);
             } catch(error) {
-                this.rediscover_cpu_fan();
+                this.rediscover_cpu_fan(fan_file);
                 global.log('CPU fan speed file read error: ' + error.toString());
             }
         });

system-monitor-graph@rcassani/fan-speed-on.png

@@ -6,9 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-desklets/"
-"issues\n"
-"POT-Creation-Date: 2026-07-20 21:19+0530\n"
+"Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-desklets/issues\n"
+"POT-Creation-Date: 2026-07-22 03:33+0530\n"
 "PO-Revision-Date: 2025-09-29 04:41+0200\n"
 "Last-Translator: Daniel <d3vf4n@tutanota.com>\n"
 "Language-Team: \n"
@@ -20,124 +19,128 @@ msgstr ""
 "X-Generator: Poedit 3.6\n"
 
 #. settings-schema.json->type->options
-#. desklet.js:283
+#. desklet.js:284
 msgid "CPU"
 msgstr "CPU"
 
-#. desklet.js:292
-msgid "CPU Temp"
+#. desklet.js:293
+msgid "CPU Temperature"
 msgstr ""
 
-#. desklet.js:303
-msgid "CPU Fan Speed"
+#. desklet.js:304
+msgid "CPU Fan"
 msgstr ""
 
-#. desklet.js:307
-msgid "On"
+#. desklet.js:308
+msgid "RPM"
 msgstr ""
 
 #. desklet.js:309
+msgid "On"
+msgstr ""
+
+#. desklet.js:311
 msgid "Off"
 msgstr ""
 
-#. desklet.js:312
+#. desklet.js:314
 msgid "Not detected"
 msgstr ""
 
-#. desklet.js:314
+#. desklet.js:316
 msgid "Detecting..."
 msgstr ""
 
-#. desklet.js:327 desklet.js:345 desklet.js:365 desklet.js:406 desklet.js:736
+#. desklet.js:329 desklet.js:347 desklet.js:367 desklet.js:408 desklet.js:738
 msgid "GB"
 msgstr "GB"
 
-#. desklet.js:330 desklet.js:348 desklet.js:368 desklet.js:409 desklet.js:750
+#. desklet.js:332 desklet.js:350 desklet.js:370 desklet.js:411 desklet.js:752
 msgid "GiB"
 msgstr "GiB"
 
 #. settings-schema.json->type->options
-#. desklet.js:332
+#. desklet.js:334
 msgid "RAM"
 msgstr "RAM"
 
 #. settings-schema.json->type->options
-#. desklet.js:350
+#. desklet.js:352
 msgid "Swap"
 msgstr "Swap"
 
-#. desklet.js:373
+#. desklet.js:375
 msgid "free of"
 msgstr "lliure de"
 
-#. desklet.js:389
+#. desklet.js:391
 msgid "GPU Usage"
 msgstr "Ús de GPU"
 
-#. desklet.js:411
+#. desklet.js:413
 msgid "GPU Memory"
 msgstr "Memòria de la GPU"
 
-#. desklet.js:427
+#. desklet.js:429
 #, fuzzy
 msgid "GPU Temperature"
 msgstr "Fabricant de la GPU"
 
 #. settings-schema.json->type->options
-#. desklet.js:441
+#. desklet.js:443
 msgid "Network"
 msgstr "Xarxa"
 
 #. settings-schema.json->type->options
-#. desklet.js:454
+#. desklet.js:456
 msgid "Battery"
 msgstr ""
 
-#. desklet.js:457
+#. desklet.js:459
 msgid "Fully charged"
 msgstr ""
 
-#. desklet.js:458
+#. desklet.js:460
 msgid "Not charging"
 msgstr ""
 
-#. desklet.js:460
+#. desklet.js:462
 msgid " hrs"
 msgstr ""
 
-#. desklet.js:707 desklet.js:730
+#. desklet.js:709 desklet.js:732
 msgid "b"
 msgstr "b"
 
-#. desklet.js:709 desklet.js:744 desklet.js:758
+#. desklet.js:711 desklet.js:746 desklet.js:760
 msgid "B"
 msgstr "B"
 
-#. desklet.js:722
+#. desklet.js:724
 msgid "Gb"
 msgstr "Gb"
 
-#. desklet.js:725
+#. desklet.js:727
 msgid "Mb"
 msgstr "Mb"
 
-#. desklet.js:728
+#. desklet.js:730
 msgid "Kb"
 msgstr "Kb"
 
-#. desklet.js:739
+#. desklet.js:741
 msgid "MB"
 msgstr "MB"
 
-#. desklet.js:742
+#. desklet.js:744
 msgid "KB"
 msgstr "KB"
 
-#. desklet.js:753
+#. desklet.js:755
 msgid "MiB"
 msgstr "MiB"
 
-#. desklet.js:756
+#. desklet.js:758
 msgid "KiB"
 msgstr "KiB"
 
@@ -276,10 +279,11 @@ msgstr "Interfície de xarxa a monitorar"
 
 #. settings-schema.json->network-interface->tooltip
 msgid ""
-"Leave empty to monitor all interfaces combined. Examples: eth0, wlan0, enp0s3"
+"Leave empty to monitor all interfaces combined. Examples: eth0, wlan0, "
+"enp0s3"
 msgstr ""
-"Deixeu-ho en blanc per a monitorar totes les interfícies. Per exemple: eth0, "
-"wlan0, enp0s3"
+"Deixeu-ho en blanc per a monitorar totes les interfícies. Per exemple: eth0,"
+" wlan0, enp0s3"
 
 #. settings-schema.json->battery-name->description
 #, fuzzy