Merge pull request #34 from pythonlover02/next

Release 1.2.1

Author: pythonlover02

images/1.png

@@ -1,19 +1,18 @@
 from PySide6.QtWidgets import QWidget, QVBoxLayout, QScrollArea, QLabel
 from PySide6.QtCore import Qt
 
-
 class AboutManager:
 
     @staticmethod
     def get_about_info():
         """
-        Returns a list of dictionaries containing about information.
+        Returns a list of dictionaries containing the about information.
         """
         return [
             {"label": "Description", "text": "Simple GUI program for modifying and creating the `volt` script and more. Providing an intuitive interface for configuration management, with the objective of getting the maximum performance posible of a PC"},
             {"label": "License", "text": "GPL-3.0 License"},
             {"label": "Author", "text": "pythonlover02"},
-            {"label": "Version", "text": "1.2.0"},
+            {"label": "Version", "text": "1.2.1"},
         ]
 
     @staticmethod

images/2.png

@@ -1,18 +1,16 @@
-import os
-import configparser
+import os, configparser
 from pathlib import Path
 from kernel import KernelManager
-
+from cpu import CPUManager
+from disk import DiskManager
+from gpu_launch import GPULaunchManager
 
 class ConfigManager:
-    """
-    Handles saving and loading of application configuration settings.
-    """
 
     @staticmethod
     def get_config_path(profile_name="Default"):
         """
-        Get the configuration file path, creating directories if needed.
+        Get the configuration file path for a given profile.
         """
         config_dir = Path(os.path.expanduser("~/.config/volt-gui"))
         config_dir.mkdir(parents=True, exist_ok=True)
@@ -24,7 +22,7 @@ def get_config_path(profile_name="Default"):
     @staticmethod
     def get_available_profiles():
         """
-        Get list of available profile names.
+        Get a list of all available configuration profiles.
         """
         config_dir = Path(os.path.expanduser("~/.config/volt-gui"))
         profiles = ["Default"]
@@ -39,64 +37,56 @@ def get_available_profiles():
     @staticmethod
     def save_config(cpu_widgets, gpu_widgets, kernel_widgets, disk_widgets, profile_name="Default"):
         """
-        Save all widget settings to the configuration file.
+        Save configuration settings to a profile file.
         """
         config = configparser.ConfigParser()
 
-        config['CPU'] = {
-            'governor': cpu_widgets['gov_combo'].currentText(),
-            'max_freq': cpu_widgets['max_freq_combo'].currentText(),
-            'min_freq': cpu_widgets['min_freq_combo'].currentText(),
-            'scheduler': cpu_widgets['sched_combo'].currentText()
-        }
-        
-        config['Mesa'] = {}
-        for widget_key, widget in gpu_widgets['mesa'].items():
-            if hasattr(widget, 'currentText') and widget_key != 'mesa_apply_button':
-                config['Mesa'][widget_key] = widget.currentText()
-        
-        config['NVIDIA'] = {}
-        for widget_key, widget in gpu_widgets['nvidia'].items():
-            if hasattr(widget, 'currentText') and widget_key != 'nvidia_apply_button':
-                config['NVIDIA'][widget_key] = widget.currentText()
-        
-        config['RenderSelector'] = {}
-        for widget_key, widget in gpu_widgets['render_selector'].items():
-            if hasattr(widget, 'currentText') and widget_key != 'render_selector_apply_button':
-                config['RenderSelector'][widget_key] = widget.currentText()
-        
-        config['RenderPipeline'] = {}
-        for widget_key, widget in gpu_widgets['render_pipeline'].items():
-            if hasattr(widget, 'currentText') and widget_key != 'render_pipeline_apply_button':
-                config['RenderPipeline'][widget_key] = widget.currentText()
-            
-        if 'launch_options_input' in gpu_widgets['launch_options']:
-            launch_options = gpu_widgets['launch_options']['launch_options_input'].text().replace('%', '%%')
+        cpu_config = {}
+        for setting_key in CPUManager.CPU_SETTINGS.keys():
+            if setting_key in cpu_widgets and hasattr(cpu_widgets[setting_key], 'currentText'):
+                cpu_config[setting_key] = cpu_widgets[setting_key].currentText()
+        if cpu_config:
+            config['CPU'] = cpu_config
+        
+        gpu_config = {}
+        for setting_key in GPULaunchManager.GPU_SETTINGS.keys():
+            for category_name, category_widgets in gpu_widgets.items():
+                if category_name != 'LaunchOptions' and setting_key in category_widgets:
+                    if hasattr(category_widgets[setting_key], 'currentText'):
+                        gpu_config[setting_key] = category_widgets[setting_key].currentText()
+                    break
+        if gpu_config:
+            config['GPU'] = gpu_config
+        
+        if 'LaunchOptions' in gpu_widgets and 'launch_options_input' in gpu_widgets['LaunchOptions']:
+            launch_options = gpu_widgets['LaunchOptions']['launch_options_input'].text().replace('%', '%%')
             config['LaunchOptions'] = {'launch_options': launch_options}
 
-        if kernel_widgets:
-            kernel_config = {}
-            for setting_name in KernelManager.KERNEL_SETTINGS.keys():
-                value = kernel_widgets[f'{setting_name}_input'].text().strip()
+        kernel_config = {}
+        for setting_key in KernelManager.KERNEL_SETTINGS.keys():
+            widget_key = f'{setting_key}_input'
+            if widget_key in kernel_widgets:
+                value = kernel_widgets[widget_key].text().strip()
                 if value:
-                    kernel_config[setting_name] = value
-            if kernel_config:
-                config['Kernel'] = kernel_config
-        
-        if disk_widgets and 'disk_combos' in disk_widgets:
-            disk_config = {}
-            for disk_name, scheduler_combo in disk_widgets['disk_combos'].items():
-                disk_config[disk_name] = scheduler_combo.currentText()
-            if disk_config:
-                config['Disk'] = disk_config
+                    kernel_config[setting_key] = value
+        if kernel_config:
+            config['Kernel'] = kernel_config
+        
+        disk_config = {}
+        for disk_name, disk_widgets_dict in disk_widgets['disk_settings'].items():
+            for setting_key in DiskManager.DISK_SETTINGS.keys():
+                if setting_key in disk_widgets_dict:
+                    disk_config[f"{disk_name}_{setting_key}"] = disk_widgets_dict[setting_key].currentText()
+        if disk_config:
+            config['Disk'] = disk_config
 
         with open(ConfigManager.get_config_path(profile_name), 'w') as configfile:
             config.write(configfile)
 
     @staticmethod
     def load_config(cpu_widgets, gpu_widgets, kernel_widgets, disk_widgets, profile_name="Default"):
         """
-        Load settings from configuration file and apply to widgets.
+        Load configuration settings from a profile file.
         """
         config = configparser.ConfigParser()
         config_path = ConfigManager.get_config_path(profile_name)
@@ -107,52 +97,42 @@ def load_config(cpu_widgets, gpu_widgets, kernel_widgets, disk_widgets, profile_
         config.read(config_path)
 
         if 'CPU' in config:
-            cpu_widgets['gov_combo'].setCurrentText(config['CPU'].get('governor', 'unset'))
-            cpu_widgets['max_freq_combo'].setCurrentText(config['CPU'].get('max_freq', 'unset'))
-            cpu_widgets['min_freq_combo'].setCurrentText(config['CPU'].get('min_freq', 'unset'))
-            cpu_widgets['sched_combo'].setCurrentText(config['CPU'].get('scheduler', 'unset'))
-        
-        if 'Mesa' in config and 'mesa' in gpu_widgets:
-            for widget_key, value in config['Mesa'].items():
-                if widget_key in gpu_widgets['mesa'] and hasattr(gpu_widgets['mesa'][widget_key], 'setCurrentText'):
-                    gpu_widgets['mesa'][widget_key].setCurrentText(value)
-        
-        if 'NVIDIA' in config and 'nvidia' in gpu_widgets:
-            for widget_key, value in config['NVIDIA'].items():
-                if widget_key in gpu_widgets['nvidia'] and hasattr(gpu_widgets['nvidia'][widget_key], 'setCurrentText'):
-                    gpu_widgets['nvidia'][widget_key].setCurrentText(value)
-        
-        if 'RenderSelector' in config and 'render_selector' in gpu_widgets:
-            for widget_key, value in config['RenderSelector'].items():
-                if widget_key in gpu_widgets['render_selector'] and hasattr(gpu_widgets['render_selector'][widget_key], 'setCurrentText'):
-                    gpu_widgets['render_selector'][widget_key].setCurrentText(value)
-    
-        if 'RenderPipeline' in config and 'render_pipeline' in gpu_widgets:
-            for widget_key, value in config['RenderPipeline'].items():
-                if widget_key in gpu_widgets['render_pipeline'] and hasattr(gpu_widgets['render_pipeline'][widget_key], 'setCurrentText'):
-                    gpu_widgets['render_pipeline'][widget_key].setCurrentText(value)
+            for setting_key in CPUManager.CPU_SETTINGS.keys():
+                if setting_key in config['CPU'] and setting_key in cpu_widgets:
+                    cpu_widgets[setting_key].setCurrentText(config['CPU'][setting_key])
+        
+        if 'GPU' in config:
+            for setting_key in GPULaunchManager.GPU_SETTINGS.keys():
+                if setting_key in config['GPU']:
+                    for category_name, category_widgets in gpu_widgets.items():
+                        if category_name != 'LaunchOptions' and setting_key in category_widgets:
+                            category_widgets[setting_key].setCurrentText(config['GPU'][setting_key])
+                            break
 
-        if 'LaunchOptions' in config and 'launch_options' in gpu_widgets and 'launch_options_input' in gpu_widgets['launch_options']:
+        if 'LaunchOptions' in config and 'LaunchOptions' in gpu_widgets and 'launch_options_input' in gpu_widgets['LaunchOptions']:
             launch_options = config['LaunchOptions'].get('launch_options', '').replace('%%', '%')
-            gpu_widgets['launch_options']['launch_options_input'].setText(launch_options)
+            gpu_widgets['LaunchOptions']['launch_options_input'].setText(launch_options)
 
         if kernel_widgets and 'Kernel' in config:
-            for setting_name, value in config['Kernel'].items():
-                if setting_name in KernelManager.KERNEL_SETTINGS:
-                    input_widget = kernel_widgets[f'{setting_name}_input']
-                    input_widget.setText(value)
-        
-        if disk_widgets and 'disk_combos' in disk_widgets and 'Disk' in config:
-            for disk_name, scheduler in config['Disk'].items():
-                if disk_name in disk_widgets['disk_combos']:
-                    disk_widgets['disk_combos'][disk_name].setCurrentText(scheduler)
+            for setting_key in KernelManager.KERNEL_SETTINGS.keys():
+                if setting_key in config['Kernel']:
+                    widget_key = f'{setting_key}_input'
+                    if widget_key in kernel_widgets:
+                        kernel_widgets[widget_key].setText(config['Kernel'][setting_key])
+        
+        if disk_widgets and 'disk_settings' in disk_widgets and 'Disk' in config:
+            for config_key, value in config['Disk'].items():
+                if '_' in config_key:
+                    disk_name, setting_key = config_key.rsplit('_', 1)
+                    if disk_name in disk_widgets['disk_settings'] and setting_key in disk_widgets['disk_settings'][disk_name]:
+                        disk_widgets['disk_settings'][disk_name][setting_key].setCurrentText(value)
 
         return True
 
     @staticmethod
     def delete_profile(profile_name):
         """
-        Delete a profile configuration file.
+        Delete a configuration profile. Cannot delete the Default profile.
         """
         if profile_name == "Default":
             return False
@@ -162,85 +142,4 @@ def delete_profile(profile_name):
             config_path.unlink()
             return True
 
-        return False
-
-    @staticmethod
-    def save_current_profile_preference(profile_name):
-        """
-        Save the currently selected profile as the last used profile.
-        """
-        config_dir = Path(os.path.expanduser("~/.config/volt-gui"))
-        config_dir.mkdir(parents=True, exist_ok=True)
-        
-        config_path = config_dir / "volt-session.ini"
-        config = configparser.ConfigParser()
-        
-        if config_path.exists():
-            try:
-                config.read(config_path)
-            except:
-                pass
-        
-        if not config.has_section('Session'):
-            config.add_section('Session')
-        
-        config.set('Session', 'last_profile', profile_name)
-        
-        try:
-            with open(config_path, 'w') as configfile:
-                config.write(configfile)
-        except Exception as e:
-            print(f"Warning: Failed to save session config: {e}")
-
-    @staticmethod
-    def load_current_profile_preference():
-        """
-        Load the last used profile from session config.
-        """
-        config_path = Path(os.path.expanduser("~/.config/volt-gui/volt-session.ini"))
-        
-        if not config_path.exists():
-            return "Default"
-        
-        config = configparser.ConfigParser()
-        try:
-            config.read(config_path)
-            if config.has_section('Session') and config.has_option('Session', 'last_profile'):
-                last_profile = config.get('Session', 'last_profile')
-                available_profiles = ConfigManager.get_available_profiles()
-                if last_profile in available_profiles:
-                    return last_profile
-        except Exception as e:
-            print(f"Warning: Failed to load session config: {e}")
-        
-        return "Default"
-
-    @staticmethod
-    def load_options_settings():
-        """
-        Load options settings from configuration file.
-        """
-        options_path = Path(os.path.expanduser("~/.config/volt-gui/volt-options.ini"))
-        use_system_tray = True
-        start_minimized = False
-
-        if not options_path.exists():
-            return use_system_tray, start_minimized
-
-        config = configparser.ConfigParser()
-        try:
-            config.read(options_path)
-
-            if 'SystemTray' in config and 'run_in_tray' in config['SystemTray']:
-                use_system_tray = config['SystemTray']['run_in_tray'] == 'enable'
-
-            if 'StartupBehavior' in config and 'start_minimized' in config['StartupBehavior']:
-                if use_system_tray:
-                    start_minimized = config['StartupBehavior'].get('start_minimized', 'disable') == 'enable'
-                else:
-                    start_minimized = False
-
-        except Exception as e:
-            print(f"Warning: Failed to load options settings: {e}")
-
-        return use_system_tray, start_minimized
+        return False