diff options
| author | xXJSONDeruloXx <danielhimebauch@gmail.com> | 2025-07-18 23:33:42 -0400 |
|---|---|---|
| committer | xXJSONDeruloXx <danielhimebauch@gmail.com> | 2025-07-18 23:33:42 -0400 |
| commit | 2087af2315b14e82117e643c16686e9555aa9d9b (patch) | |
| tree | 8327aed1081c80dab0cbe92991c7f96292b5a7d7 /py_modules | |
| parent | a96d2764f036e2ea8f8625533b2f37b8291eda31 (diff) | |
| download | decky-lsfg-vk-2087af2315b14e82117e643c16686e9555aa9d9b.tar.gz decky-lsfg-vk-2087af2315b14e82117e643c16686e9555aa9d9b.zip | |
rm circular logic bug with legacy enable bool
Diffstat (limited to 'py_modules')
| -rw-r--r-- | py_modules/lsfg_vk/config_schema.py | 34 | ||||
| -rw-r--r-- | py_modules/lsfg_vk/configuration.py | 7 | ||||
| -rw-r--r-- | py_modules/lsfg_vk/plugin.py | 5 |
3 files changed, 13 insertions, 33 deletions
diff --git a/py_modules/lsfg_vk/config_schema.py b/py_modules/lsfg_vk/config_schema.py index 460b0a0..45afc2d 100644 --- a/py_modules/lsfg_vk/config_schema.py +++ b/py_modules/lsfg_vk/config_schema.py @@ -38,13 +38,6 @@ class ConfigField: # Configuration schema definition CONFIG_SCHEMA: Dict[str, ConfigField] = { - "enable": ConfigField( - name="enable", - field_type=ConfigFieldType.BOOLEAN, - default=True, - description="enable/disable lsfg on every game" - ), - "dll": ConfigField( name="dll", field_type=ConfigFieldType.STRING, @@ -55,7 +48,7 @@ CONFIG_SCHEMA: Dict[str, ConfigField] = { "multiplier": ConfigField( name="multiplier", field_type=ConfigFieldType.INTEGER, - default=2, + default=1, description="change the fps multiplier" ), @@ -112,7 +105,6 @@ CONFIG_SCHEMA: Dict[str, ConfigField] = { class ConfigurationData(TypedDict): """Type-safe configuration data structure""" - enable: bool dll: str multiplier: int flow_scale: float @@ -219,25 +211,21 @@ class ConfigurationManager: # Add all configuration fields to the game section for field_name, field_def in CONFIG_SCHEMA.items(): - # Skip dll and enable fields - dll goes in global, enable is handled via multiplier - if field_name in ["dll", "enable"]: + # Skip dll field - dll goes in global section + if field_name == "dll": continue value = config[field_name] - # Handle enable field by setting multiplier to 1 when disabled - if field_name == "multiplier" and not config.get("enable", True): - value = 1 - lines.append(f"# LSFG disabled via plugin - multiplier set to 1") - else: - lines.append(f"# {field_def.description}") + # Add field description comment + lines.append(f"# {field_def.description}") # Format value based on type if isinstance(value, bool): lines.append(f"{field_name} = {str(value).lower()}") elif isinstance(value, str) and value: # Only add non-empty strings lines.append(f'{field_name} = "{value}"') - elif isinstance(value, (int, float)) and value != 0: # Only add non-zero numbers + elif isinstance(value, (int, float)): # Always include numbers, even if 0 or 1 lines.append(f"{field_name} = {value}") lines.append("") # Empty line for readability @@ -306,12 +294,7 @@ class ConfigurationManager: config[key] = value.lower() in ('true', '1', 'yes', 'on') elif field_def.field_type == ConfigFieldType.INTEGER: parsed_value = int(value) - # Handle enable field via multiplier - if key == "multiplier": - config[key] = parsed_value - config["enable"] = parsed_value != 1 - else: - config[key] = parsed_value + config[key] = parsed_value elif field_def.field_type == ConfigFieldType.FLOAT: config[key] = float(value) elif field_def.field_type == ConfigFieldType.STRING: @@ -327,7 +310,7 @@ class ConfigurationManager: return ConfigurationManager.get_defaults() @staticmethod - def create_config_from_args(enable: bool, dll: str, multiplier: int, flow_scale: float, + def create_config_from_args(dll: str, multiplier: int, flow_scale: float, performance_mode: bool, hdr_mode: bool, experimental_present_mode: str = "", experimental_fps_limit: int = 0, @@ -335,7 +318,6 @@ class ConfigurationManager: disable_steamdeck_mode: bool = False) -> ConfigurationData: """Create configuration from individual arguments""" return cast(ConfigurationData, { - "enable": enable, "dll": dll, "multiplier": multiplier, "flow_scale": flow_scale, diff --git a/py_modules/lsfg_vk/configuration.py b/py_modules/lsfg_vk/configuration.py index ae0194b..1952a49 100644 --- a/py_modules/lsfg_vk/configuration.py +++ b/py_modules/lsfg_vk/configuration.py @@ -65,7 +65,7 @@ class ConfigurationService(BaseService): "error": None } - def update_config(self, enable: bool, dll: str, multiplier: int, flow_scale: float, + def update_config(self, dll: str, multiplier: int, flow_scale: float, performance_mode: bool, hdr_mode: bool, experimental_present_mode: str = "", experimental_fps_limit: int = 0, @@ -74,7 +74,6 @@ class ConfigurationService(BaseService): """Update TOML configuration Args: - enable: Whether to enable LSFG dll: Path to Lossless.dll multiplier: LSFG multiplier value flow_scale: LSFG flow scale value @@ -91,7 +90,7 @@ class ConfigurationService(BaseService): try: # Create configuration from individual arguments config = ConfigurationManager.create_config_from_args( - enable, dll, multiplier, flow_scale, performance_mode, hdr_mode, + dll, multiplier, flow_scale, performance_mode, hdr_mode, experimental_present_mode, experimental_fps_limit, enable_wow64, disable_steamdeck_mode ) @@ -109,7 +108,7 @@ class ConfigurationService(BaseService): if not script_result["success"]: self.log.warning(f"Failed to update launch script: {script_result['error']}") - self.log.info(f"Updated lsfg TOML configuration: enable={enable}, " + self.log.info(f"Updated lsfg TOML configuration: " f"dll='{dll}', multiplier={multiplier}, flow_scale={flow_scale}, " f"performance_mode={performance_mode}, hdr_mode={hdr_mode}, " f"experimental_present_mode='{experimental_present_mode}', " diff --git a/py_modules/lsfg_vk/plugin.py b/py_modules/lsfg_vk/plugin.py index 60eab8c..4e19a2a 100644 --- a/py_modules/lsfg_vk/plugin.py +++ b/py_modules/lsfg_vk/plugin.py @@ -184,7 +184,7 @@ class Plugin: "defaults": ConfigurationManager.get_defaults() } - async def update_lsfg_config(self, enable: bool, dll: str, multiplier: int, flow_scale: float, + async def update_lsfg_config(self, dll: str, multiplier: int, flow_scale: float, performance_mode: bool, hdr_mode: bool, experimental_present_mode: str = "", experimental_fps_limit: int = 0, @@ -193,7 +193,6 @@ class Plugin: """Update lsfg TOML configuration Args: - enable: Whether to enable LSFG dll: Path to Lossless.dll multiplier: LSFG multiplier value flow_scale: LSFG flow scale value @@ -208,7 +207,7 @@ class Plugin: ConfigurationResponse dict with success status """ return self.configuration_service.update_config( - enable, dll, multiplier, flow_scale, performance_mode, hdr_mode, + dll, multiplier, flow_scale, performance_mode, hdr_mode, experimental_present_mode, experimental_fps_limit, enable_wow64, disable_steamdeck_mode ) |
