refactor: simplify migration implementation

1 files changed, 31 insertions, 48 deletions

diff --git a/py_modules/lsfg_vk/installation.py b/py_modules/lsfg_vk/installation.py
index 8a3094d..5a583f5 100644
--- a/py_modules/lsfg_vk/installation.py
+++ b/py_modules/lsfg_vk/installation.py
@@ -48,26 +48,20 @@ class InstallationService(BaseService):
 
     def install(self) -> InstallationResponse:
         try:
-            plugin_dir = Path(__file__).parent.parent.parent
-            archive_path = plugin_dir / BIN_DIR / ARCHIVE_FILENAME
+            archive_path = Path(__file__).parent.parent.parent / BIN_DIR / ARCHIVE_FILENAME
             if not archive_path.exists():
                 raise FileNotFoundError(f"{ARCHIVE_FILENAME} not found at {archive_path}")
-
             self._ensure_directories()
             profile_data = self._prepare_config()
             self._install_archive(archive_path)
-            config_content = ConfigurationManager.generate_toml_content_multi_profile(profile_data)
-            self.runtime_service.validate_config_content(config_content)
-            self._write_file(
-                self.config_file_path,
-                config_content,
-                0o644,
-            )
+            content = ConfigurationManager.generate_toml_content_multi_profile(profile_data)
+            self.runtime_service.validate_config_content(content)
+            self._write_file(self.config_file_path, content, 0o644)
             self._remove_legacy_layer_files()
             return self._success_response(InstallationResponse, "lsfg-vk 2.0.0 installed successfully")
         except Exception as error:
             self.log.error(f"Error installing lsfg-vk: {error}")
-            return self._error_response(InstallationResponse, str(error), message="")
+            return self._error_response(InstallationResponse, str(error))
 
     def _payload_destinations(self) -> Dict[str, tuple[Path, int]]:
         return {
@@ -82,7 +76,7 @@ class InstallationService(BaseService):
                 0o644,
             ),
             f"share/icons/hicolor/256x256/apps/{UI_ICON_FILENAME}": (
-                self.user_home / LOCAL_SHARE / "icons" / "hicolor" / "256x256" / "apps" / UI_ICON_FILENAME,
+                self.user_home / LOCAL_SHARE / "icons/hicolor/256x256/apps" / UI_ICON_FILENAME,
                 0o644,
             ),
         }
@@ -124,35 +118,26 @@ class InstallationService(BaseService):
                     if temporary_path is not None:
                         temporary_path.unlink(missing_ok=True)
                     raise
-
         missing = sorted(set(destinations) - found)
         if missing:
             raise OSError("Archive is missing required files: " + ", ".join(missing))
 
     def _prepare_config(self) -> ProfileData:
         if self.config_file_path.exists():
-            content = self.config_file_path.read_text(encoding="utf-8")
-            legacy = ConfigurationManager.is_legacy_v1(content)
-            profile_data = ConfigurationManager.parse_toml_content_multi_profile(content)
-            if legacy:
-                backup_path = self.config_file_path.with_name(f"{self.config_file_path.name}.v1.bak")
-                if not backup_path.exists():
-                    self._write_file(backup_path, content, 0o644)
+            profile_data = ConfigurationManager.parse_toml_content_multi_profile(
+                self.config_file_path.read_text(encoding="utf-8")
+            )
         else:
-            default = dict(ConfigurationManager.get_defaults())
+            defaults = ConfigurationManager.get_defaults()
             profile_data = ProfileData(
                 profiles={},
-                global_config={
-                    "dll": default.get("dll", ""),
-                    "no_fp16": default.get("no_fp16", False),
-                },
+                global_config={"dll": defaults["dll"], "no_fp16": defaults["no_fp16"]},
             )
-
         self._resolve_dll_path(profile_data)
-        defaults = dict(ConfigurationManager.get_defaults())
-        for profile_name, raw_profile in list(profile_data["profiles"].items()):
-            profile_data["profiles"][profile_name] = ConfigurationManager.validate_config(
-                {**defaults, **raw_profile, **profile_data["global_config"]}
+        defaults = ConfigurationManager.get_defaults()
+        for name, profile in profile_data["profiles"].items():
+            profile_data["profiles"][name] = ConfigurationManager.validate_config(
+                {**defaults, **profile, **profile_data["global_config"]}
             )
         return profile_data
 
@@ -160,7 +145,6 @@ class InstallationService(BaseService):
         current_path = str(profile_data["global_config"].get("dll") or "")
         if current_path and Path(current_path).is_file():
             return False
-
         dll_path = self.steam_service.find_lsfg_vk_dll()
         if dll_path and current_path != dll_path:
             profile_data["global_config"]["dll"] = dll_path
@@ -179,7 +163,6 @@ class InstallationService(BaseService):
             except Exception as error:
                 installed = False
                 installation_error = str(error)
-
             lossless_scaling = self.runtime_service.check_lossless_scaling()
             return {
                 "installed": installed,
@@ -197,21 +180,22 @@ class InstallationService(BaseService):
 
     def uninstall(self) -> UninstallationResponse:
         try:
-            removed = []
-            for path in (
-                self.lib_file,
-                self.lib_x86_file,
-                self.json_file,
-                self.json_x86_file,
-                self.cli_file,
-                self.local_bin_dir / UI_FILENAME,
-                self.user_home / LOCAL_SHARE / "applications" / UI_DESKTOP_FILENAME,
-                self.user_home / LOCAL_SHARE / "icons" / "hicolor" / "256x256" / "apps" / UI_ICON_FILENAME,
-                self.legacy_lib_file,
-                self.legacy_json_file,
-            ):
-                if self._remove_if_exists(path):
-                    removed.append(str(path))
+            removed = [
+                str(path)
+                for path in (
+                    self.lib_file,
+                    self.lib_x86_file,
+                    self.json_file,
+                    self.json_x86_file,
+                    self.cli_file,
+                    self.local_bin_dir / UI_FILENAME,
+                    self.user_home / LOCAL_SHARE / "applications" / UI_DESKTOP_FILENAME,
+                    self.user_home / LOCAL_SHARE / "icons/hicolor/256x256/apps" / UI_ICON_FILENAME,
+                    self.legacy_lib_file,
+                    self.legacy_json_file,
+                )
+                if self._remove_if_exists(path)
+            ]
             if not removed:
                 return self._success_response(
                     UninstallationResponse,
@@ -227,7 +211,6 @@ class InstallationService(BaseService):
             return self._error_response(
                 UninstallationResponse,
                 str(error),
-                message="",
                 removed_files=None,
             )