Enable hot plugging temp and fan sources

* Fan and temp sources can be removed or added during execution
* We handle this in the PR by marking removed sensors as N/A
* Re-adding them will make the sensors appear back

Author: amanusk

s_tui/s_tui.py

@@ -699,14 +699,14 @@ def _load_config(self, t_thresh):
         ]
         for source in sources:
             try:
-                options = list(self.conf.items(source + ",Graphs"))
-                for option in options:
-                    # Returns tuples of values in order
-                    self.graphs_default_conf[source].append(str_to_bool(option[1]))
-                options = list(self.conf.items(source + ",Summaries"))
-                for option in options:
-                    # Returns tuples of values in order
-                    self.summary_default_conf[source].append(str_to_bool(option[1]))
+                for option_name, option_value in self.conf.items(source + ",Graphs"):
+                    self.graphs_default_conf[source][option_name] = str_to_bool(
+                        option_value
+                    )
+                for option_name, option_value in self.conf.items(source + ",Summaries"):
+                    self.summary_default_conf[source][option_name] = str_to_bool(
+                        option_value
+                    )
             except (
                 AttributeError,
                 ValueError,
@@ -752,8 +752,8 @@ def __init__(self, args):
 
         self.smooth_graph_mode = False
 
-        self.summary_default_conf = defaultdict(list)
-        self.graphs_default_conf = defaultdict(list)
+        self.summary_default_conf = defaultdict(dict)
+        self.graphs_default_conf = defaultdict(dict)
 
         self.temp_thresh = None
 

s_tui/sensors_menu.py

@@ -22,7 +22,6 @@
 
 from __future__ import print_function
 from __future__ import absolute_import
-import copy
 
 import urwid
 from s_tui.sturwid.ui_elements import ViListBox
@@ -52,15 +51,13 @@ def __init__(self, return_fn, source_list, default_source_conf):
         for source in source_list:
             source_name = source.get_source_name()
 
-            # get the saves sensor visibility list
-            if default_source_conf[source_name]:
-                # print(str(default_source_conf[source_name]))
-                self.sensor_status_dict[source_name] = copy.deepcopy(
-                    default_source_conf[source_name]
-                )
-            else:
-                self.sensor_status_dict[source_name] = [True] * len(
-                    source.get_sensor_list()
+            # Build per-sensor visibility from config dict (keyed by name)
+            conf = default_source_conf[source_name]  # dict or empty dict
+            self.sensor_status_dict[source_name] = []
+            for sensor in source.get_sensor_list():
+                # ConfigParser lowercases keys, so compare lowercase
+                self.sensor_status_dict[source_name].append(
+                    conf.get(sensor.lower(), True)
                 )
 
             self.sensor_button_dict[source_name] = []

s_tui/sources/fan_source.py

@@ -60,6 +60,7 @@ def __init__(self):
             self.is_available = False
             return
 
+        self._sensor_lookup = {}
         for key, value in sensors_dict.items():
             sensor_name = key
             for sensor_idx, sensor in enumerate(value):
@@ -74,7 +75,9 @@ def __init__(self):
                 logging.debug("Fan sensor name %s", full_name)
 
                 self.available_sensors.append(full_name)
+                self._sensor_lookup[(key, sensor_idx)] = len(self.available_sensors) - 1
 
+        self.sensor_available = [True] * len(self.available_sensors)
         self.last_measurement = [0] * len(self.available_sensors)
 
     def update(self):
@@ -90,13 +93,24 @@ def update(self):
         if sample is None:
             logging.debug("sensors_fans() returned None, keeping stale data")
             return
-        self.last_measurement = []
-        for sensor in sample.values():
-            for minor_sensor in sensor:
-                # Ignore unreasonable fan speeds
+
+        updated = set()
+        for key, sensors in sample.items():
+            for sensor_idx, minor_sensor in enumerate(sensors):
+                idx = self._sensor_lookup.get((key, sensor_idx))
+                if idx is None:
+                    continue  # new sensor not in original list
                 if minor_sensor.current > 10000:
+                    self.sensor_available[idx] = False
                     continue
-                self.last_measurement.append(int(minor_sensor.current))
+                self.last_measurement[idx] = int(minor_sensor.current)
+                self.sensor_available[idx] = True
+                updated.add(idx)
+
+        # Mark sensors not seen in this sample as unavailable
+        for idx in range(len(self.available_sensors)):
+            if idx not in updated:
+                self.sensor_available[idx] = False
 
     def get_edge_triggered(self):
         return False

s_tui/sources/temp_source.py

@@ -76,6 +76,7 @@ def __init__(self, temp_thresh=None):
             logging.debug("Unable to create sensors dict")
             self.is_available = False
             return
+        self._sensor_lookup = {}
         multi_sensors = []
         for key, value in sensors_dict.items():
             sensor_name = "".join(key.title().split(" "))
@@ -95,6 +96,7 @@ def __init__(self, temp_thresh=None):
 
                 logging.debug("Temp sensor name %s", full_name)
                 self.available_sensors.append(full_name)
+                self._sensor_lookup[(key, sensor_idx)] = len(self.available_sensors) - 1
 
         self.sensor_available = [True] * len(self.available_sensors)
         self.last_measurement = [0] * len(self.available_sensors)
@@ -125,25 +127,40 @@ def update(self):
         except IOError:
             return
 
-        self.last_measurement = []
-        self.last_thresholds = []
-        for sensor in sample:
-            for minor_sensor in sample[sensor]:
+        updated = set()
+        for key, sensors in sample.items():
+            for sensor_idx, minor_sensor in enumerate(sensors):
+                idx = self._sensor_lookup.get((key, sensor_idx))
+                if idx is None:
+                    continue  # new sensor not in original list
                 if minor_sensor.current <= 1.0 or minor_sensor.current >= 127.0:
+                    self.sensor_available[idx] = False
                     continue
-                self.last_measurement.append(minor_sensor.current)
+                self.last_measurement[idx] = minor_sensor.current
                 if (
                     minor_sensor.high is not None
                     and minor_sensor.high
                     and minor_sensor.high < 127.0
                     and self.temp_thresh_is_set is False
                 ):
-                    self.last_thresholds.append(minor_sensor.high)
+                    self.last_thresholds[idx] = minor_sensor.high
                 else:
-                    self.last_thresholds.append(self.temp_thresh)
-
-        if self.last_measurement:
-            self.max_last_temp = max(self.last_measurement)
+                    self.last_thresholds[idx] = self.temp_thresh
+                self.sensor_available[idx] = True
+                updated.add(idx)
+
+        # Mark sensors not seen in this sample as unavailable
+        for idx in range(len(self.available_sensors)):
+            if idx not in updated:
+                self.sensor_available[idx] = False
+
+        available_temps = [
+            self.last_measurement[i]
+            for i in range(len(self.available_sensors))
+            if self.sensor_available[i]
+        ]
+        if available_temps:
+            self.max_last_temp = max(available_temps)
             # Call check for hooks
             Source.update(self)
 

tests/test_config_delimiter.py

@@ -12,6 +12,7 @@
 
 import os
 import pytest
+from collections import defaultdict
 from unittest.mock import MagicMock, patch
 import configparser
 
@@ -153,3 +154,69 @@ def test_configparser_delimiter_consistency(self):
             )
         finally:
             os.unlink(temp_file)
+
+
+class TestConfigSensorNameMatching:
+    """Test that sensor config is matched by name, not position.
+
+    Verifies the fix for config loading that uses sensor names as keys
+    instead of positional lists, so reordering/adding/removing sensors
+    between restarts doesn't misalign visibility settings.
+    """
+
+    def test_config_fewer_sensors_than_system(self):
+        """Config has fewer sensors than currently on the system.
+
+        New sensors should default to visible (True).
+        """
+        from s_tui.sensors_menu import SensorsMenu
+
+        # Create a mock source with 3 sensors
+        source = MagicMock()
+        source.get_source_name.return_value = "Temp"
+        source.get_sensor_list.return_value = ["Core0,0", "Core1,0", "Core2,0"]
+
+        # Config only knows about 2 of them (dict keyed by lowercase name)
+        default_conf = {"Temp": {"core0,0": True, "core1,0": False}}
+
+        menu = SensorsMenu(MagicMock(), [source], default_conf)
+        active = menu.active_sensors["Temp"]
+        assert active[0] is True   # Core0,0 from config
+        assert active[1] is False  # Core1,0 from config
+        assert active[2] is True   # Core2,0 new, defaults visible
+
+    def test_config_more_sensors_than_system(self):
+        """Config has more sensors than currently on the system.
+
+        Extra config entries should be silently ignored.
+        """
+        from s_tui.sensors_menu import SensorsMenu
+
+        # System has only 1 sensor
+        source = MagicMock()
+        source.get_source_name.return_value = "Temp"
+        source.get_sensor_list.return_value = ["Core0,0"]
+
+        # Config has entries for 3 sensors
+        default_conf = {
+            "Temp": {"core0,0": False, "core1,0": True, "core2,0": True}
+        }
+
+        menu = SensorsMenu(MagicMock(), [source], default_conf)
+        active = menu.active_sensors["Temp"]
+        assert len(active) == 1
+        assert active[0] is False  # Core0,0 from config
+
+    def test_config_empty_defaults_all_visible(self):
+        """No config for a source means all sensors default to visible."""
+        from s_tui.sensors_menu import SensorsMenu
+
+        source = MagicMock()
+        source.get_source_name.return_value = "Fan"
+        source.get_sensor_list.return_value = ["fan0", "fan1"]
+
+        default_conf = defaultdict(dict)
+
+        menu = SensorsMenu(MagicMock(), [source], default_conf)
+        active = menu.active_sensors["Fan"]
+        assert active == [True, True]

tests/test_fan_source.py

@@ -46,8 +46,11 @@ def test_filters_unreasonable_speeds(self, mocker):
         src = FanSource()
         src.update()
         readings = src.get_reading_list()
-        assert len(readings) == 1
+        # Both sensors are in the list, but the unreasonable one is marked unavailable
+        assert len(readings) == 2
         assert readings[0] == 1200
+        assert src.sensor_available[0] is True
+        assert src.sensor_available[1] is False
 
     def test_edge_triggered_always_false(self, mock_sensors_fans):
         src = FanSource()

tests/test_runtime_disruption.py

@@ -146,8 +146,7 @@ class TestTempSensorChanges:
     def test_temp_sensor_disappears(self, mocker):
         """sensors_temperatures() returns fewer sensors mid-run.
 
-        Current behaviour: no crash; sensor list retains original length,
-        missing sensors may show stale data.
+        Disappeared sensor is marked N/A via sensor_available.
         """
         sensors_2 = [
             SensorTemperature(label="Core 0", current=55.0, high=80.0, critical=100.0),
@@ -168,11 +167,14 @@ def test_temp_sensor_disappears(self, mocker):
 
         summary = src.get_sensors_summary()
         assert summary is not None
+        assert len(src.get_sensor_list()) == 2
+        # Core 0 still available, Core 1 disappeared
+        assert src.sensor_available[0] is True
+        assert src.sensor_available[1] is False
+        # Summary shows N/A for disappeared sensor
+        values = list(summary.values())
+        assert values[1] == "N/A"
 
-    @pytest.mark.xfail(
-        strict=True,
-        reason="TempSource summary IndexError when new sensor appears mid-run",
-    )
     def test_temp_sensor_appears(self, mocker):
         """New sensor shows up in sensors_temperatures() mid-run."""
         sensors_1 = [
@@ -235,8 +237,7 @@ def test_fan_typeerror_during_update(self, mocker):
     def test_fan_sensor_disappears(self, mocker):
         """sensors_fans() returns empty dict mid-run.
 
-        Current behaviour: no crash; sensor list retains original length,
-        missing fans show stale data.
+        Disappeared fan sensor is marked N/A via sensor_available.
         """
         fans = make_fans_dict(count=1)
         mocker.patch("psutil.sensors_fans", return_value=fans)
@@ -249,6 +250,11 @@ def test_fan_sensor_disappears(self, mocker):
 
         summary = src.get_sensors_summary()
         assert summary is not None
+        assert len(src.get_sensor_list()) == 1
+        assert src.sensor_available[0] is False
+        # Summary shows N/A for disappeared sensor
+        values = list(summary.values())
+        assert values[0] == "N/A"
 
 
 # =====================================================================

tests/test_sensors_menu.py

@@ -26,10 +26,10 @@ def simple_sources():
 
 @pytest.fixture
 def default_conf():
-    """Default config: all sensors visible."""
+    """Default config: all sensors visible (dict keyed by lowercase sensor name)."""
     return {
-        "CPU Util": [True, True],
-        "Temp": [True, True, True],
+        "CPU Util": {"avg": True, "core 0": True},
+        "Temp": {"core 0": True, "core 1": True, "core 2": True},
     }
 
 
@@ -46,9 +46,9 @@ def menu(simple_sources, default_conf):
 
 class TestSensorsMenuInit:
     def test_active_sensors_match_defaults(self, menu, default_conf):
-        """active_sensors should mirror the default config."""
-        for name, states in default_conf.items():
-            assert menu.active_sensors[name] == states
+        """active_sensors should mirror the default config values."""
+        for name, conf_dict in default_conf.items():
+            assert menu.active_sensors[name] == list(conf_dict.values())
 
     def test_sensor_button_dict_populated(self, menu):
         """Each source should have checkbox entries."""
@@ -72,7 +72,9 @@ def test_main_window_is_urwid_widget(self, menu):
 
     def test_no_default_conf_defaults_to_all_true(self, simple_sources):
         """When default_source_conf entry is falsy, all sensors default True."""
-        conf = {"CPU Util": None, "Temp": None}
+        from collections import defaultdict
+
+        conf = defaultdict(dict)
         return_fn = MagicMock()
         m = SensorsMenu(return_fn, simple_sources, conf)
         assert m.active_sensors["CPU Util"] == [True, True]