wip

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

Author: patrickelectric

core/services/wifi/settings.py

@@ -1,3 +1,4 @@
+import json
 from typing import Any, Dict
 
 import pykson  # type: ignore
@@ -28,12 +29,14 @@ def migrate(self, data: Dict[str, Any]) -> None:
 
 class SettingsV2(SettingsV1):
     VERSION = 2
-    # Stores user-selected mode per interface: {"wlan0": "normal", "wlan1": "hotspot"}
-    interface_modes = pykson.ObjectField(dict, default_value={})
+    # Stores user-selected mode per interface as JSON: '{"wlan0": "normal", "wlan1": "hotspot"}'
+    interface_modes_json = pykson.StringField()
 
     def __init__(self, *args: str, **kwargs: int) -> None:
         super().__init__(*args, **kwargs)
         self.VERSION = SettingsV2.VERSION
+        if not self.interface_modes_json:
+            self.interface_modes_json = "{}"
 
     def migrate(self, data: Dict[str, Any]) -> None:
         if data["VERSION"] == SettingsV2.VERSION:
@@ -42,8 +45,19 @@ def migrate(self, data: Dict[str, Any]) -> None:
         if data["VERSION"] < SettingsV2.VERSION:
             super().migrate(data)
 
-        # Migration from version 1 to 2: add interface_modes
-        if "interface_modes" not in data:
-            data["interface_modes"] = {}
+        # Migration from version 1 to 2: add interface_modes_json
+        if "interface_modes_json" not in data:
+            data["interface_modes_json"] = "{}"
 
         data["VERSION"] = SettingsV2.VERSION
+
+    def get_interface_modes(self) -> Dict[str, str]:
+        """Get interface modes as a dictionary."""
+        try:
+            return json.loads(self.interface_modes_json or "{}")
+        except json.JSONDecodeError:
+            return {}
+
+    def set_interface_modes(self, modes: Dict[str, str]) -> None:
+        """Set interface modes from a dictionary."""
+        self.interface_modes_json = json.dumps(modes)

core/services/wifi/wifi_handlers/networkmanager/networkmanager.py

@@ -106,15 +106,15 @@ def __init__(self) -> None:
 
     def _save_interface_mode(self, interface: str, mode: WifiInterfaceMode) -> None:
         """Persist the interface mode to settings."""
-        interface_modes = getattr(self._settings_manager.settings, "interface_modes", {}) or {}
+        interface_modes = self._settings_manager.settings.get_interface_modes()
         interface_modes[interface] = mode.value
-        self._settings_manager.settings.interface_modes = interface_modes
+        self._settings_manager.settings.set_interface_modes(interface_modes)
         self._settings_manager.save()
         logger.info(f"Saved {interface} mode: {mode.value}")
 
     def _get_stored_interface_mode(self, interface: str) -> Optional[WifiInterfaceMode]:
         """Get the stored mode for an interface from settings, or None if not set."""
-        interface_modes = getattr(self._settings_manager.settings, "interface_modes", {}) or {}
+        interface_modes = self._settings_manager.settings.get_interface_modes()
         mode_str = interface_modes.get(interface)
         if mode_str:
             try: