1 files changed, 69 insertions, 39 deletions

diff --git a/cogs/utils/settings.py b/cogs/utils/settings.py
index 0a1716f..984ec16 100644
--- a/cogs/utils/settings.py
+++ b/cogs/utils/settings.py
@@ -7,56 +7,86 @@ import json
 import logging
 import aiofiles
 import os
+from dataclasses import dataclass, field
 
 logger = logging.getLogger(__name__)
 
-_settings = None
 settings_file = "data/settings.json"
 
-async def load_settings():
-    global _settings
-    global settings_file
-    
-    default_settings = {
-        'volume': 1.0,
-        'baseurl': 'http://localhost:8080'
-    }
-    
-    try:
-        if os.path.exists(settings_file):
-            async with aiofiles.open(settings_file, 'r') as f:
-                content = await f.read()
-                if content.strip():
-                    _settings = json.loads(content)
-                    logger.info("Settings loaded into memory")
-                else:
-                    _settings = default_settings
-                    await save_settings()
-                    logger.warning("Empty settings.json, reset to defaults")
-        else:
-            _settings = default_settings
-            await save_settings()
-            logger.info("Created default settings.json")
-    except (json.JSONDecodeError, Exception) as e:
-        logger.error(f"Error loading settings: {e}")
-        _settings = default_settings
-    
-    return _settings
+
+@dataclass
+class Settings:
+    volume: float = 1.0
+    baseurl: str = "http://localhost:8080"
+    _data: dict = field(default_factory=dict, init=False)
+
+    async def load(self) -> "Settings":
+        default_settings = {
+            "volume": 1.0,
+            "baseurl": "http://localhost:8080",
+        }
+
+        try:
+            if os.path.exists(settings_file):
+                async with aiofiles.open(settings_file, "r") as f:
+                    content = await f.read()
+                    if content.strip():
+                        self._data = json.loads(content)
+                        self._sync_from_data()
+                        logger.info("Settings loaded into memory")
+                    else:
+                        self._data = default_settings.copy()
+                        self._sync_from_data()
+                        await self.save()
+                        logger.warning("Empty settings.json, reset to defaults")
+            else:
+                self._data = default_settings.copy()
+                self._sync_from_data()
+                await self.save()
+                logger.info("Created default settings.json")
+        except (json.JSONDecodeError, Exception) as e:
+            logger.error(f"Error loading settings: {e}")
+            self._data = default_settings.copy()
+            self._sync_from_data()
+
+        return self
+
+    def _sync_from_data(self):
+        self.volume = self._data.get("volume", 1.0)
+        self.baseurl = self._data.get("baseurl", "http://localhost:8080")
+
+    def _sync_to_data(self):
+        self._data["volume"] = self.volume
+        self._data["baseurl"] = self.baseurl
+
+    async def save(self):
+        self._sync_to_data()
+        async with aiofiles.open(settings_file, "w") as f:
+            await f.write(json.dumps(self._data, indent=2))
+
+
+_settings_instance: Settings | None = None
+
+
+async def load_settings() -> Settings:
+    global _settings_instance
+    _settings_instance = Settings()
+    await _settings_instance.load()
+    return _settings_instance
 
 
 async def save_settings():
-    if _settings:
-        async with aiofiles.open(settings_file, 'w') as f:
-            await f.write(json.dumps(_settings, indent=2))
+    if _settings_instance:
+        await _settings_instance.save()
 
 
-def get_settings():
-    return _settings
+def get_settings() -> Settings | None:
+    return _settings_instance
 
 
-def get_volume():
-    return _settings.get('volume', 1.0) if _settings else 1.0
+def get_volume() -> float:
+    return _settings_instance.volume if _settings_instance else 1.0
 
 
-def get_baseurl():
-    return _settings.get('baseurl', 'http://localhost:8080').rstrip('/') if _settings else 'http://localhost:8080'
\ No newline at end of file
+def get_baseurl() -> str:
+    return _settings_instance.baseurl.rstrip("/") if _settings_instance else "http://localhost:8080"