Merge pull request #190 from xXJSONDeruloXx/cleanup-misc

More cleanup

Author: xXJSONDeruloXx

.gitignore

@@ -56,10 +56,10 @@ cli/
 cli/*
 cli/decky
 
-# generated files
-py_modules/lsfg_vk/config_schema_generated.py
-py_modules/lsfg_vk/configuration_helpers_generated.py
-src/config/generatedConfigSchema.ts
+# generated files (uncommented for now, need in git for store build deploys)
+# py_modules/lsfg_vk/config_schema_generated.py
+# py_modules/lsfg_vk/configuration_helpers_generated.py
+# src/config/generatedConfigSchema.ts
 
 # Additional development artifacts
 *.pyc

main.py

@@ -2,12 +2,8 @@
 Main entry point for the lsfg-vk Decky Loader plugin.
 
 This file imports and exposes the Plugin class from the lsfg_vk package.
-The actual implementation has been refactored into separate service modules
-for better maintainability and testability.
 """
 
-# Import the refactored Plugin class
 from lsfg_vk import Plugin
 
-# Re-export Plugin at module level for Decky Loader compatibility
 __all__ = ['Plugin']

package.json

@@ -1,6 +1,6 @@
 {
   "name": "decky-lsfg-vk",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "Use Lossless Scaling on the Steam Deck using the lsfg-vk vulkan layer",
   "type": "module",
   "scripts": {

py_modules/lsfg_vk/__init__.py

@@ -5,10 +5,9 @@
 Vulkan layer for Lossless Scaling frame generation.
 """
 
-# Import will be available once plugin.py exists
 try:
     from .plugin import Plugin
     __all__ = ['Plugin']
 except ImportError:
-    # During development, plugin may not exist yet
     __all__ = []
+

py_modules/lsfg_vk/base_service.py

@@ -12,7 +12,6 @@
 
 from .constants import LOCAL_LIB, LOCAL_SHARE_BASE, VULKAN_LAYER_DIR, SCRIPT_NAME, CONFIG_DIR, CONFIG_FILENAME
 
-# Generic type for response dictionaries
 ResponseType = TypeVar('ResponseType', bound=Dict[str, Any])
 
 
@@ -30,12 +29,11 @@ def __init__(self, logger: Optional[Any] = None):
         else:
             self.log = logger
 
-        # Initialize common paths using pathlib
         self.user_home = Path.home()
         self.local_lib_dir = self.user_home / LOCAL_LIB
         self.local_share_dir = self.user_home / VULKAN_LAYER_DIR
         self.lsfg_script_path = self.user_home / SCRIPT_NAME
-        self.lsfg_launch_script_path = self.user_home / SCRIPT_NAME  # ~/lsfg launch script
+        self.lsfg_launch_script_path = self.user_home / SCRIPT_NAME
         self.config_dir = self.user_home / CONFIG_DIR
         self.config_file_path = self.config_dir / CONFIG_FILENAME
 
@@ -82,13 +80,11 @@ def _write_file(self, path: Path, content: str, mode: int = 0o644) -> None:
             OSError: If write fails
         """
         try:
-            # Write directly to the file
             with open(path, 'w', encoding='utf-8') as f:
                 f.write(content)
-                f.flush()  # Ensure data is written to disk
-                os.fsync(f.fileno())  # Force filesystem sync
+                f.flush()
+                os.fsync(f.fileno())
 
-            # Set permissions
             path.chmod(mode)
             self.log.info(f"Wrote to {path}")
 

py_modules/lsfg_vk/configuration.py

@@ -22,17 +22,14 @@ def get_config(self) -> ConfigurationResponse:
             ConfigurationResponse with current configuration or error
         """
         try:
-            # Get TOML configuration (with defaults if file doesn't exist)
             if not self.config_file_path.exists():
-                # Return default configuration with DLL detection if file doesn't exist
                 from .dll_detection import DllDetectionService
                 dll_service = DllDetectionService(self.log)
                 toml_config = ConfigurationManager.get_defaults_with_dll_detection(dll_service)
             else:
                 content = self.config_file_path.read_text(encoding='utf-8')
                 toml_config = ConfigurationManager.parse_toml_content(content)
 
-            # Get script environment variables (if script exists)
             script_values = {}
             if self.lsfg_script_path.exists():
                 try:
@@ -42,7 +39,6 @@ def get_config(self) -> ConfigurationResponse:
                 except Exception as e:
                     self.log.warning(f"Failed to parse launch script: {str(e)}")
 
-            # Merge TOML config with script values
             config = ConfigurationManager.merge_config_with_script(toml_config, script_values)
 
             return self._success_response(ConfigurationResponse, config=config)
@@ -54,7 +50,6 @@ def get_config(self) -> ConfigurationResponse:
         except Exception as e:
             error_msg = f"Error parsing config file: {str(e)}"
             self.log.error(error_msg)
-            # Return defaults with DLL detection if parsing fails
             from .dll_detection import DllDetectionService
             dll_service = DllDetectionService(self.log)
             config = ConfigurationManager.get_defaults_with_dll_detection(dll_service)
@@ -75,7 +70,6 @@ def update_config_from_dict(self, config: ConfigurationData) -> ConfigurationRes
             profile_data = self._get_profile_data()
             current_profile = profile_data["current_profile"]
 
-            # Update the current profile's config
             return self.update_profile_config(current_profile, config)
 
         except (OSError, IOError) as e:
@@ -97,10 +91,8 @@ def update_config(self, **kwargs) -> ConfigurationResponse:
             ConfigurationResponse with success status
         """
         try:
-            # Create configuration from keyword arguments using generated function
             config = ConfigurationManager.create_config_from_args(**kwargs)
 
-            # Update using the new profile-aware method
             return self.update_config_from_dict(config)
 
         except (OSError, IOError) as e:
@@ -112,45 +104,6 @@ def update_config(self, **kwargs) -> ConfigurationResponse:
             self.log.error(error_msg)
             return self._error_response(ConfigurationResponse, str(e), config=None)
 
-    def update_dll_path(self, dll_path: str) -> ConfigurationResponse:
-        """Update just the DLL path in the configuration
-        
-        Args:
-            dll_path: Path to the Lossless.dll file
-            
-        Returns:
-            ConfigurationResponse with success status
-        """
-        try:
-            profile_data = self._get_profile_data()
-            
-            # Update global config (DLL path is global)
-            profile_data["global_config"]["dll"] = dll_path
-            
-            # Also update current profile's config for backward compatibility
-            current_profile = profile_data["current_profile"]
-            from .config_schema_generated import DLL
-            profile_data["profiles"][current_profile][DLL] = dll_path
-            
-            # Save to file
-            self._save_profile_data(profile_data)
-            
-            # Update launch script
-            script_result = self.update_lsfg_script_from_profile_data(profile_data)
-            if not script_result["success"]:
-                self.log.warning(f"Failed to update launch script: {script_result['error']}")
-            
-            self.log.info(f"Updated DLL path in lsfg configuration: '{dll_path}'")
-            
-            return self._success_response(ConfigurationResponse,
-                                        f"DLL path updated to: {dll_path}",
-                                        config=profile_data["profiles"][current_profile])
-            
-        except Exception as e:
-            error_msg = f"Error updating DLL path: {str(e)}"
-            self.log.error(error_msg)
-            return self._error_response(ConfigurationResponse, str(e), config=None)
-    
     def update_lsfg_script(self, config: ConfigurationData) -> ConfigurationResponse:
         """Update the ~/lsfg launch script with current configuration
         
@@ -163,7 +116,6 @@ def update_lsfg_script(self, config: ConfigurationData) -> ConfigurationResponse
         try:
             script_content = self._generate_script_content(config)
 
-            # Write the script file
             self._write_file(self.lsfg_script_path, script_content, 0o755)
 
             self.log.info(f"Updated lsfg launch script at {self.lsfg_script_path}")
@@ -189,14 +141,12 @@ def _generate_script_content(self, config: ConfigurationData) -> str:
         lines = [
             "#!/bin/bash",
             "# lsfg-vk launch script generated by decky-lossless-scaling-vk plugin",
-            "# This script sets up the environment for lsfg-vk to work with the plugin configuration"
+            "# This script sets up the environment for lsfg-vk to work with the plugin configuration",
         ]
 
-        # Use auto-generated script generation logic
         generate_script_lines = get_script_generation_logic()
         lines.extend(generate_script_lines(config))
 
-        # Always add the LSFG_PROCESS export and execution line
         lines.extend([
             "export LSFG_PROCESS=decky-lsfg-vk",
             'exec "$@"'
@@ -216,23 +166,18 @@ def _generate_script_content_for_profile(self, profile_data: ProfileData) -> str
         current_profile = profile_data["current_profile"]
         config = profile_data["profiles"].get(current_profile, ConfigurationManager.get_defaults())
 
-        # Merge global config with profile config
         merged_config = dict(config)
         for field_name, value in profile_data["global_config"].items():
             merged_config[field_name] = value
 
         lines = [
             "#!/bin/bash",
-            "# lsfg-vk launch script generated by decky-lossless-scaling-vk plugin",
             f"# Current profile: {current_profile}",
-            "# This script sets up the environment for lsfg-vk to work with the plugin configuration"
         ]
 
-        # Use auto-generated script generation logic
         generate_script_lines = get_script_generation_logic()
         lines.extend(generate_script_lines(merged_config))
 
-        # Export LSFG_PROCESS with current profile name
         lines.extend([
             f"export LSFG_PROCESS={current_profile}",
             'exec "$@"'
@@ -243,7 +188,6 @@ def _generate_script_content_for_profile(self, profile_data: ProfileData) -> str
     def _get_profile_data(self) -> ProfileData:
         """Get current profile data from config file"""
         if not self.config_file_path.exists():
-            # Return default profile structure if file doesn't exist
             from .dll_detection import DllDetectionService
             dll_service = DllDetectionService(self.log)
             default_config = ConfigurationManager.get_defaults_with_dll_detection(dll_service)
@@ -263,13 +207,10 @@ def _save_profile_data(self, profile_data: ProfileData) -> None:
         """Save profile data to config file"""
         toml_content = ConfigurationManager.generate_toml_content_multi_profile(profile_data)
 
-        # Ensure config directory exists
         self.config_dir.mkdir(parents=True, exist_ok=True)
 
-        # Write the updated config directly to preserve inode for file watchers
         self._write_file(self.config_file_path, toml_content, 0o644)
 
-    # Profile management methods
     def get_profiles(self) -> ProfilesResponse:
         """Get list of all profiles and current profile
         
@@ -303,14 +244,11 @@ def create_profile(self, profile_name: str, source_profile: str = None) -> Profi
         try:
             profile_data = self._get_profile_data()
 
-            # Use current profile as source if not specified
             if not source_profile:
                 source_profile = profile_data["current_profile"]
 
-            # Create the new profile
             new_profile_data = ConfigurationManager.create_profile(profile_data, profile_name, source_profile)
 
-            # Save to file
             self._save_profile_data(new_profile_data)
 
             self.log.info(f"Created profile '{profile_name}' from '{source_profile}'")
@@ -340,13 +278,10 @@ def delete_profile(self, profile_name: str) -> ProfileResponse:
         try:
             profile_data = self._get_profile_data()
 
-            # Delete the profile
             new_profile_data = ConfigurationManager.delete_profile(profile_data, profile_name)
 
-            # Save to file
             self._save_profile_data(new_profile_data)
 
-            # Update launch script if current profile changed
             script_result = self.update_lsfg_script_from_profile_data(new_profile_data)
             if not script_result["success"]:
                 self.log.warning(f"Failed to update launch script: {script_result['error']}")
@@ -379,13 +314,10 @@ def rename_profile(self, old_name: str, new_name: str) -> ProfileResponse:
         try:
             profile_data = self._get_profile_data()
 
-            # Rename the profile
             new_profile_data = ConfigurationManager.rename_profile(profile_data, old_name, new_name)
 
-            # Save to file
             self._save_profile_data(new_profile_data)
 
-            # Update launch script if current profile changed
             script_result = self.update_lsfg_script_from_profile_data(new_profile_data)
             if not script_result["success"]:
                 self.log.warning(f"Failed to update launch script: {script_result['error']}")
@@ -417,13 +349,10 @@ def set_current_profile(self, profile_name: str) -> ProfileResponse:
         try:
             profile_data = self._get_profile_data()
 
-            # Set current profile
             new_profile_data = ConfigurationManager.set_current_profile(profile_data, profile_name)
 
-            # Save to file
             self._save_profile_data(new_profile_data)
 
-            # Update launch script with new current profile
             script_result = self.update_lsfg_script_from_profile_data(new_profile_data)
             if not script_result["success"]:
                 self.log.warning(f"Failed to update launch script: {script_result['error']}")
@@ -469,16 +398,13 @@ def update_profile_config(self, profile_name: str, config: ConfigurationData) ->
                 if field_name in config:
                     profile_data["global_config"][field_name] = config[field_name]
 
-            # Save to file
             self._save_profile_data(profile_data)
 
-            # Update launch script if this is the current profile
             if profile_name == profile_data["current_profile"]:
                 script_result = self.update_lsfg_script_from_profile_data(profile_data)
                 if not script_result["success"]:
                     self.log.warning(f"Failed to update launch script: {script_result['error']}")
 
-            # Log with dynamic field listing
             field_values = ", ".join(f"{k}={repr(v)}" for k, v in config.items())
             self.log.info(f"Updated profile '{profile_name}' configuration: {field_values}")
 

py_modules/lsfg_vk/constants.py

@@ -4,36 +4,30 @@
 
 from pathlib import Path
 
-# Directory paths
 LOCAL_LIB = ".local/lib"
 LOCAL_SHARE_BASE = ".local/share"
 VULKAN_LAYER_DIR = ".local/share/vulkan/implicit_layer.d"
 CONFIG_DIR = ".config/lsfg-vk"
 
-# File names
 SCRIPT_NAME = "lsfg"
 CONFIG_FILENAME = "conf.toml"
 LIB_FILENAME = "liblsfg-vk.so"
 JSON_FILENAME = "VkLayer_LS_frame_generation.json"
 ZIP_FILENAME = "lsfg-vk_noui.zip"
 
-# Flatpak files
 FLATPAK_23_08_FILENAME = "org.freedesktop.Platform.VulkanLayer.lsfg_vk_23.08.flatpak"
 FLATPAK_24_08_FILENAME = "org.freedesktop.Platform.VulkanLayer.lsfg_vk_24.08.flatpak"
 FLATPAK_25_08_FILENAME = "org.freedesktop.Platform.VulkanLayer.lsfg_vk_25.08.flatpak"
 
-# File extensions
 SO_EXT = ".so"
 JSON_EXT = ".json"
 
-# Directory for the zip file
 BIN_DIR = "bin"
 
-# Lossless Scaling paths
 STEAM_COMMON_PATH = Path("steamapps/common/Lossless Scaling")
 LOSSLESS_DLL_NAME = "Lossless.dll"
 
-# Environment variable names
 ENV_LSFG_DLL_PATH = "LSFG_DLL_PATH"
 ENV_XDG_DATA_HOME = "XDG_DATA_HOME"
 ENV_HOME = "HOME"
+