summaryrefslogtreecommitdiff
path: root/py_modules/lsfg_vk
diff options
context:
space:
mode:
Diffstat (limited to 'py_modules/lsfg_vk')
-rw-r--r--py_modules/lsfg_vk/config_schema.py19
-rw-r--r--py_modules/lsfg_vk/configuration.py19
-rw-r--r--py_modules/lsfg_vk/installation.py9
3 files changed, 42 insertions, 5 deletions
diff --git a/py_modules/lsfg_vk/config_schema.py b/py_modules/lsfg_vk/config_schema.py
index bf3e174..8b1f29c 100644
--- a/py_modules/lsfg_vk/config_schema.py
+++ b/py_modules/lsfg_vk/config_schema.py
@@ -12,6 +12,12 @@ class ProfileData(TypedDict):
global_config: Dict[str, Any]
+class UnsupportedConfigurationVersion(ValueError):
+ def __init__(self, version: Any):
+ self.version = version
+ super().__init__("unsupported lsfg-vk configuration version")
+
+
PROFILE_DEFAULTS: Dict[str, Any] = {
"active_in": [],
"pacing_mode": "vsync",
@@ -46,6 +52,14 @@ def _normalize_active_in(value: Any) -> list[str]:
class ConfigurationManager:
@staticmethod
+ def is_discardable_legacy_version(version: Any) -> bool:
+ return version is None or version == "1" or (
+ isinstance(version, (int, float))
+ and not isinstance(version, bool)
+ and version < 2
+ )
+
+ @staticmethod
def get_defaults() -> Dict[str, Any]:
return {**GLOBAL_DEFAULTS, **PROFILE_DEFAULTS}
@@ -99,8 +113,9 @@ class ConfigurationManager:
@staticmethod
def parse_toml_content_multi_profile(content: str) -> ProfileData:
data = tomllib.loads(content)
- if data.get("version") != 2:
- raise ValueError("unsupported lsfg-vk configuration version")
+ version = data.get("version")
+ if version != 2:
+ raise UnsupportedConfigurationVersion(version)
raw_global = data.get("global", {})
global_config = {
"dll": str(raw_global.get("dll", "") or ""),
diff --git a/py_modules/lsfg_vk/configuration.py b/py_modules/lsfg_vk/configuration.py
index 3c65972..427aa3b 100644
--- a/py_modules/lsfg_vk/configuration.py
+++ b/py_modules/lsfg_vk/configuration.py
@@ -2,7 +2,7 @@ import re
from typing import Any, Dict
from .base_service import BaseService
-from .config_schema import ConfigurationManager, ProfileData
+from .config_schema import ConfigurationManager, ProfileData, UnsupportedConfigurationVersion
from .runtime_service import RuntimeService
@@ -16,10 +16,25 @@ class ConfigurationService(BaseService):
def _default_data(self) -> ProfileData:
return {"profiles": {}, "global_config": {"dll": "", "no_fp16": False}}
+ def _reset_legacy_config(self, version: Any) -> ProfileData:
+ data = self._default_data()
+ content = ConfigurationManager.generate_toml_content_multi_profile(data)
+ self._write_file(self.config_file_path, content)
+ self.log.warning(
+ f"Discarded legacy lsfg-vk configuration version {version!r}; reset conf.toml to v2 defaults"
+ )
+ return data
+
def _get_profile_data(self) -> ProfileData:
if not self.config_file_path.exists():
return self._default_data()
- return ConfigurationManager.parse_toml_content_multi_profile(self.config_file_path.read_text(encoding="utf-8"))
+ content = self.config_file_path.read_text(encoding="utf-8")
+ try:
+ return ConfigurationManager.parse_toml_content_multi_profile(content)
+ except UnsupportedConfigurationVersion as error:
+ if not ConfigurationManager.is_discardable_legacy_version(error.version):
+ raise
+ return self._reset_legacy_config(error.version)
def _save_profile_data(self, data: ProfileData) -> None:
content = ConfigurationManager.generate_toml_content_multi_profile(data)
diff --git a/py_modules/lsfg_vk/installation.py b/py_modules/lsfg_vk/installation.py
index 4003228..05ef4d0 100644
--- a/py_modules/lsfg_vk/installation.py
+++ b/py_modules/lsfg_vk/installation.py
@@ -7,7 +7,7 @@ from pathlib import Path
from typing import Dict
from .base_service import BaseService
-from .config_schema import ConfigurationManager, ProfileData
+from .config_schema import ConfigurationManager, ProfileData, UnsupportedConfigurationVersion
from .constants import (
ARCHIVE_FILENAME,
BIN_DIR,
@@ -138,6 +138,13 @@ class InstallationService(BaseService):
if self.config_file_path.exists()
else self._default_config()
)
+ except UnsupportedConfigurationVersion as error:
+ if not ConfigurationManager.is_discardable_legacy_version(error.version):
+ raise
+ self.log.warning(
+ f"Discarding legacy lsfg-vk configuration version {error.version!r} during installation"
+ )
+ profile_data = self._default_config()
except ValueError:
profile_data = self._default_config()
self._resolve_dll_path(profile_data)