Feature/refactor config system

src/apps/Highbyte.DotNet6502.App.SadConsole/ConfigUI/C64ConfigUIConsole.cs

@@ -16,14 +16,13 @@ public class C64ConfigUIConsole : Window
     private const int USABLE_WIDTH = 60;
     private const int USABLE_HEIGHT = 28;
 
-    public readonly C64Config C64Config;
+    public C64SystemConfig C64SystemConfig => C64HostConfig.SystemConfig;
     public readonly C64HostConfig C64HostConfig;
     private readonly IConfiguration _configuration;
 
     public C64ConfigUIConsole(SadConsoleHostApp sadConsoleHostApp, IConfiguration configuration) : base(CONSOLE_WIDTH, CONSOLE_HEIGHT)
     {
 
-        C64Config = (C64Config)sadConsoleHostApp.CurrentSystemConfig.Clone();
         C64HostConfig = (C64HostConfig)sadConsoleHostApp.CurrentHostSystemConfig.Clone();
 
         Controls.ThemeColors = SadConsoleUISettings.ThemeColors;
@@ -53,7 +52,7 @@ private void DrawUIItems()
             Name = "romDirectoryTextBox",
             Position = (1, romDirectoryLabel.Position.Y + 1),
         };
-        romDirectoryTextBox.TextChanged += (s, e) => { C64Config.ROMDirectory = romDirectoryTextBox.Text; IsDirty = true; };
+        romDirectoryTextBox.TextChanged += (s, e) => { C64SystemConfig.ROMDirectory = romDirectoryTextBox.Text; IsDirty = true; };
         Controls.Add(romDirectoryTextBox);
 
         var selectROMDirectoryButton = new Button("...")
@@ -71,15 +70,15 @@ private void DrawUIItems()
             Name = "kernalROMTextBox",
             Position = (1, kernalROMLabel.Position.Y + 1)
         };
-        kernalROMTextBox.TextChanged += (s, e) => { C64Config.SetROM(C64Config.KERNAL_ROM_NAME, kernalROMTextBox!.Text); IsDirty = true; };
+        kernalROMTextBox.TextChanged += (s, e) => { C64SystemConfig.SetROM(C64SystemConfig.KERNAL_ROM_NAME, kernalROMTextBox!.Text); IsDirty = true; };
         Controls.Add(kernalROMTextBox);
 
         var selectKernalROMButton = new Button("...")
         {
             Name = "selectKernalROMButton",
             Position = (kernalROMTextBox.Bounds.MaxExtentX + 2, kernalROMTextBox.Position.Y),
         };
-        selectKernalROMButton.Click += (s, e) => ShowROMFilePickerDialog(C64Config.KERNAL_ROM_NAME);
+        selectKernalROMButton.Click += (s, e) => ShowROMFilePickerDialog(C64SystemConfig.KERNAL_ROM_NAME);
         Controls.Add(selectKernalROMButton);
 
         // Basic ROM file
@@ -89,15 +88,15 @@ private void DrawUIItems()
             Name = "basicROMTextBox",
             Position = (1, basicROMLabel.Position.Y + 1)
         };
-        basicROMTextBox.TextChanged += (s, e) => { C64Config.SetROM(C64Config.BASIC_ROM_NAME, basicROMTextBox!.Text); IsDirty = true; };
+        basicROMTextBox.TextChanged += (s, e) => { C64SystemConfig.SetROM(C64SystemConfig.BASIC_ROM_NAME, basicROMTextBox!.Text); IsDirty = true; };
         Controls.Add(basicROMTextBox);
 
         var selectBasicROMButton = new Button("...")
         {
             Name = "selectBasicROMButton",
             Position = (basicROMTextBox.Bounds.MaxExtentX + 2, basicROMTextBox.Position.Y),
         };
-        selectBasicROMButton.Click += (s, e) => ShowROMFilePickerDialog(C64Config.BASIC_ROM_NAME);
+        selectBasicROMButton.Click += (s, e) => ShowROMFilePickerDialog(C64SystemConfig.BASIC_ROM_NAME);
         Controls.Add(selectBasicROMButton);
 
         // Chargen ROM file
@@ -107,15 +106,15 @@ private void DrawUIItems()
             Name = "chargenROMTextBox",
             Position = (1, chargenROMLabel.Position.Y + 1),
         };
-        chargenROMTextBox.TextChanged += (s, e) => { C64Config.SetROM(C64Config.CHARGEN_ROM_NAME, chargenROMTextBox!.Text); IsDirty = true; };
+        chargenROMTextBox.TextChanged += (s, e) => { C64SystemConfig.SetROM(C64SystemConfig.CHARGEN_ROM_NAME, chargenROMTextBox!.Text); IsDirty = true; };
         Controls.Add(chargenROMTextBox);
 
         var selectChargenROMButton = new Button("...")
         {
             Name = "selectChargenROMButton",
             Position = (chargenROMTextBox.Bounds.MaxExtentX + 2, chargenROMTextBox.Position.Y),
         };
-        selectChargenROMButton.Click += (s, e) => ShowROMFilePickerDialog(C64Config.CHARGEN_ROM_NAME);
+        selectChargenROMButton.Click += (s, e) => ShowROMFilePickerDialog(C64SystemConfig.CHARGEN_ROM_NAME);
         Controls.Add(selectChargenROMButton);
 
 
@@ -253,14 +252,14 @@ private void OpenURL(string url)
 
     private void ShowROMFilePickerDialog(string romName)
     {
-        var currentFolder = PathHelper.ExpandOSEnvironmentVariables(C64Config.ROMDirectory);
-        var window = new FilePickerConsole(FilePickerMode.OpenFile, currentFolder, C64Config.GetROM(romName).GetROMFilePath(currentFolder));
+        var currentFolder = PathHelper.ExpandOSEnvironmentVariables(C64SystemConfig.ROMDirectory);
+        var window = new FilePickerConsole(FilePickerMode.OpenFile, currentFolder, C64SystemConfig.GetROM(romName).GetROMFilePath(currentFolder));
         window.Center();
         window.Closed += (s2, e2) =>
         {
             if (window.DialogResult)
             {
-                C64Config.SetROM(romName, Path.GetFileName(window.SelectedFile.FullName));
+                C64SystemConfig.SetROM(romName, Path.GetFileName(window.SelectedFile.FullName));
                 IsDirty = true;
             }
         };
@@ -269,14 +268,14 @@ private void ShowROMFilePickerDialog(string romName)
 
     private void ShowROMFolderPickerDialog()
     {
-        var currentFolder = PathHelper.ExpandOSEnvironmentVariables(C64Config.ROMDirectory);
+        var currentFolder = PathHelper.ExpandOSEnvironmentVariables(C64SystemConfig.ROMDirectory);
         var window = new FilePickerConsole(FilePickerMode.OpenFolder, currentFolder);
         window.Center();
         window.Closed += (s2, e2) =>
         {
             if (window.DialogResult)
             {
-                C64Config.ROMDirectory = window.SelectedDirectory.FullName;
+                C64SystemConfig.ROMDirectory = window.SelectedDirectory.FullName;
                 IsDirty = true;
             }
         };
@@ -292,25 +291,25 @@ protected override void OnIsDirtyChanged()
     private void SetControlStates()
     {
         var romDirectoryTextBox = Controls["romDirectoryTextBox"] as TextBox;
-        romDirectoryTextBox!.Text = C64Config.ROMDirectory;
+        romDirectoryTextBox!.Text = C64SystemConfig.ROMDirectory;
         romDirectoryTextBox!.IsDirty = true;
 
         var kernalROMTextBox = Controls["kernalROMTextBox"] as TextBox;
-        kernalROMTextBox!.Text = C64Config.ROMs.SingleOrDefault(x => x.Name == C64Config.KERNAL_ROM_NAME).File;
+        kernalROMTextBox!.Text = C64SystemConfig.ROMs.SingleOrDefault(x => x.Name == C64SystemConfig.KERNAL_ROM_NAME).File;
         kernalROMTextBox!.IsDirty = true;
 
         var basicROMTextBox = Controls["basicROMTextBox"] as TextBox;
-        basicROMTextBox!.Text = C64Config.ROMs.SingleOrDefault(x => x.Name == C64Config.BASIC_ROM_NAME).File;
+        basicROMTextBox!.Text = C64SystemConfig.ROMs.SingleOrDefault(x => x.Name == C64SystemConfig.BASIC_ROM_NAME).File;
         basicROMTextBox!.IsDirty = true;
 
         var chargenROMTextBox = Controls["chargenROMTextBox"] as TextBox;
-        chargenROMTextBox!.Text = C64Config.ROMs.SingleOrDefault(x => x.Name == C64Config.CHARGEN_ROM_NAME).File;
+        chargenROMTextBox!.Text = C64SystemConfig.ROMs.SingleOrDefault(x => x.Name == C64SystemConfig.CHARGEN_ROM_NAME).File;
         chargenROMTextBox!.IsDirty = true;
 
         var codingAssistantTestButton = Controls["codingAssistantTestButton"] as Button;
         codingAssistantTestButton.IsEnabled = C64HostConfig.CodeSuggestionBackendType != CodeSuggestionBackendTypeEnum.None;
 
-        var isOk = C64Config.IsValid(out List<string> validationErrors);
+        var isOk = C64SystemConfig.IsValid(out List<string> validationErrors);
         var okButton = Controls["okButton"] as Button;
         okButton!.IsEnabled = isOk;
 

src/apps/Highbyte.DotNet6502.App.SadConsole/ConfigUI/C64MenuConsole.cs

@@ -110,7 +110,7 @@ private void DrawUIItems()
         Controls.Add(c64ConfigButton);
 
 
-        var validationMessageValueLabel = CreateLabelValue(new string(' ', 20), 1, c64PasteTextButton.Bounds.MaxExtentY + 2, "validationMessageValueLabel");
+        var validationMessageValueLabel = CreateLabelValue(new string(' ', 20), 1, c64ConfigButton.Bounds.MaxExtentY + 2, "validationMessageValueLabel");
         validationMessageValueLabel.TextColor = Controls.GetThemeColors().Red;
 
         // Helper function to create a label and add it to the console
@@ -230,8 +230,7 @@ private void C64ConfigButton_Click(object sender, EventArgs e)
             if (window.DialogResult)
             {
                 // Update the system config
-                _sadConsoleHostApp.UpdateSystemConfig(window.C64Config);
-                //_sadConsoleHostApp.UpdateHostSystemConfig(window.C64HostConfig);
+                _sadConsoleHostApp.UpdateHostSystemConfig(window.C64HostConfig);
 
                 IsDirty = true;
                 SetControlStates(); // Setting IsDirty here above does not trigger OnIsDirtyChanged? Call SetControlStates directly here to make sure controls are updated.

src/apps/Highbyte.DotNet6502.App.SadConsole/MenuConsole.cs

@@ -54,17 +54,17 @@ private void DrawUIItems()
         selectSystemComboBox.SelectedItemChanged += async (s, e) =>
         {
             await _sadConsoleHostApp.SelectSystem(selectSystemComboBox.SelectedItem.ToString());
-            await _sadConsoleHostApp.SelectSystemConfigurationVariant(_sadConsoleHostApp.CurrentSystemConfigurationVariants.First());
+            await _sadConsoleHostApp.SelectSystemConfigurationVariant(_sadConsoleHostApp.AllSelectedSystemConfigurationVariants.First());
 
             var selectSystemVariantComboBox = Controls["selectSystemVariantComboBox"] as ComboBox;
-            selectSystemVariantComboBox.SetItems(_sadConsoleHostApp.CurrentSystemConfigurationVariants.ToArray());
+            selectSystemVariantComboBox.SetItems(_sadConsoleHostApp.AllSelectedSystemConfigurationVariants.ToArray());
             selectSystemVariantComboBox.SelectedIndex = 0;
             IsDirty = true;
         };
         Controls.Add(selectSystemComboBox);
 
         var variantLabel = CreateLabel("Variant:", 1, systemLabel.Bounds.MaxExtentY + 1);
-        ComboBox selectSystemVariantComboBox = new ComboBox(12, 15, 5, _sadConsoleHostApp.CurrentSystemConfigurationVariants.ToArray())
+        ComboBox selectSystemVariantComboBox = new ComboBox(12, 15, 5, _sadConsoleHostApp.AllSelectedSystemConfigurationVariants.ToArray())
         {
             Position = (variantLabel.Bounds.MaxExtentX + 2, variantLabel.Position.Y),
             Name = "selectSystemVariantComboBox",

src/apps/Highbyte.DotNet6502.App.SadConsole/SadConsoleHostApp.cs

@@ -147,6 +147,9 @@ public void Run()
 
     private IScreenObject CreateMainSadConsoleScreen(GameHost gameHost)
     {
+        // Trigger sadConsoleHostApp.SelectSystem which initilzes selected system and variants that UI creation depends on below.
+        SelectSystem(_emulatorConfig.DefaultEmulator).Wait();
+
         //ScreenSurface screen = new(gameInstance.ScreenCellsX, gameInstance.ScreenCellsY);
         //return screen;
         _sadConsoleScreen = new ScreenObject();
@@ -223,6 +226,10 @@ private IScreenObject CreateMainSadConsoleScreen(GameHost gameHost)
 
     public override void OnAfterSelectSystem()
     {
+        // Hack for when selecting a system during initialization triggers this event.
+        if (_menuConsole == null)
+            return;
+
         // Set the default font size configured for the system
         _menuConsole.SetEmulatorFontSize(CommonHostSystemConfig.DefaultFontSize);
 

src/apps/Highbyte.DotNet6502.App.SadConsole/SystemSetup/C64HostConfig.cs

@@ -1,16 +1,51 @@
+using System.Text.Json.Serialization;
 using Highbyte.DotNet6502.AI.CodingAssistant;
+using Highbyte.DotNet6502.Systems.Commodore64.Config;
 
 namespace Highbyte.DotNet6502.App.SadConsole.SystemSetup;
 
 public class C64HostConfig : SadConsoleHostSystemConfigBase
 {
+    public const string ConfigSectionName = "Highbyte.DotNet6502.C64.SadConsole";
+
+    public C64SystemConfig SystemConfig
+    {
+        get { return (C64SystemConfig)base.SystemConfig; }
+        set { base.SystemConfig = value; }
+    }
+
+    [JsonIgnore]
+    public override bool AudioSupported => true;
+
+    private bool _isDirty = false;
+    [JsonIgnore]
+    public bool IsDirty => _isDirty;
+    public void ClearDirty()
+    {
+        _isDirty = false;
+    }
+
+    public override bool IsValid(out List<string> validationErrors)
+    {
+        validationErrors = new List<string>();
+
+        SystemConfig.IsValid(out var systemConfigValidationErrors);
+        validationErrors.AddRange(systemConfigValidationErrors);
+
+        return validationErrors.Count == 0;
+    }
+
     public bool BasicAIAssistantDefaultEnabled { get; set; }
 
+    //TODO: CodeSuggestionBackendType setting should be common and not specific for a system
     public CodeSuggestionBackendTypeEnum CodeSuggestionBackendType { get; set; }
 
     public C64HostConfig()
     {
+        SystemConfig = new C64SystemConfig();
+
         BasicAIAssistantDefaultEnabled = false;
+
         CodeSuggestionBackendType = CodeSuggestionBackendTypeEnum.OpenAI;
 
         //Font = "Fonts/C64.font";
@@ -23,6 +58,7 @@ public C64HostConfig()
     public new object Clone()
     {
         var clone = (C64HostConfig)MemberwiseClone();
+        clone.SystemConfig = (C64SystemConfig)SystemConfig.Clone();
         return clone;
     }
 }

src/apps/Highbyte.DotNet6502.App.SadConsole/SystemSetup/C64Setup.cs

@@ -17,6 +17,8 @@ namespace Highbyte.DotNet6502.App.SadConsole.SystemSetup;
 public class C64Setup : ISystemConfigurer<SadConsoleRenderContext, SadConsoleInputHandlerContext, NAudioAudioHandlerContext>
 {
     public string SystemName => C64.SystemName;
+
+    public Task<List<string>> GetConfigurationVariants(IHostSystemConfig hostSystemConfig) => Task.FromResult(s_systemVariants);
     public List<string> ConfigurationVariants => s_systemVariants;
 
     private static readonly List<string> s_systemVariants = C64ModelInventory.C64Models.Keys.ToList();
@@ -33,49 +35,44 @@ public C64Setup(ILoggerFactory loggerFactory, IConfiguration configuration)
 
     public Task<IHostSystemConfig> GetNewHostSystemConfig()
     {
-        // TODO: Read all system host config from appsettings.json
-        var c64HostConfig = new C64HostConfig
-        {
-            BasicAIAssistantDefaultEnabled = false,
-            CodeSuggestionBackendType = Enum.Parse<CodeSuggestionBackendTypeEnum>(_configuration["CodingAssistant:CodingAssistantType"] ?? "None")
-        };
-        return Task.FromResult<IHostSystemConfig>(c64HostConfig);
-    }
+        var c64HostConfig = new C64HostConfig();
+        _configuration.GetSection($"{C64HostConfig.ConfigSectionName}").Bind(c64HostConfig);
 
-    public Task PersistHostSystemConfig(IHostSystemConfig hostSystemConfig)
-    {
-        // TODO: Persist settings to file
-        return Task.CompletedTask;
-    }
+        // TODO: Why is list of ROMs are duplicated when binding from appsettings.json?
+        //       This is a workaround to remove duplicates.
+        c64HostConfig.SystemConfig.ROMs = c64HostConfig.SystemConfig.ROMs.DistinctBy(p => p.Name).ToList();
 
-    public Task<ISystemConfig> GetNewConfig(string configurationVariant, IHostSystemConfig hostSystemConfig)
-    {
-        if (!s_systemVariants.Contains(configurationVariant))
-            throw new ArgumentException($"Unknown configuration variant '{configurationVariant}'.");
+        // TODO: Code suggestion AI backend type should not be set in system specific config.
+        //       For now workaround by reading from a common setting.
+        c64HostConfig.CodeSuggestionBackendType = Enum.Parse<CodeSuggestionBackendTypeEnum>(_configuration["CodingAssistant:CodingAssistantType"] ?? "None");
 
-        var c64Config = new C64Config() { ROMs = new() };
-        _configuration.GetSection($"{C64Config.ConfigSectionName}.{configurationVariant}").Bind(c64Config);
-        return Task.FromResult<ISystemConfig>(c64Config);
+        return Task.FromResult<IHostSystemConfig>(c64HostConfig);
     }
 
-    public Task PersistConfig(ISystemConfig systemConfig)
+    public Task PersistHostSystemConfig(IHostSystemConfig hostSystemConfig)
     {
-        var c64Config = (C64Config)systemConfig;
-        // TODO: Persist settings to file
-
+        // TODO: Should user settings be persisted? If so method GetNewHostSystemConfig() also needs to be updated to read from there instead of appsettings.json.
         return Task.CompletedTask;
     }
 
-    public ISystem BuildSystem(ISystemConfig systemConfig)
+    public Task<ISystem> BuildSystem(string configurationVariant, IHostSystemConfig hostSystemConfig)
     {
-        var c64Config = (C64Config)systemConfig;
+        var c64HostSystemConfig = (C64HostConfig)hostSystemConfig;
+        var c64Config = new C64Config
+        {
+            C64Model = configurationVariant,
+            Vic2Model = C64ModelInventory.C64Models[configurationVariant].Vic2Models.First().Name, // NTSC, NTSC_old, PAL
+            AudioEnabled = c64HostSystemConfig.SystemConfig.AudioEnabled,
+            ROMs = c64HostSystemConfig.SystemConfig.ROMs,
+            ROMDirectory = c64HostSystemConfig.SystemConfig.ROMDirectory,
+        };
+
         var c64 = C64.BuildC64(c64Config, _loggerFactory);
-        return c64;
+        return Task.FromResult<ISystem>(c64);
     }
 
     public Task<SystemRunner> BuildSystemRunner(
         ISystem system,
-        ISystemConfig systemConfig,
         IHostSystemConfig hostSystemConfig,
         SadConsoleRenderContext renderContext,
         SadConsoleInputHandlerContext inputHandlerContext,

src/apps/Highbyte.DotNet6502.App.SadConsole/SystemSetup/GenericComputerHostConfig.cs

@@ -1,16 +1,50 @@
+using System.Text.Json.Serialization;
+using Highbyte.DotNet6502.Systems.Generic.Config;
+
 namespace Highbyte.DotNet6502.App.SadConsole.SystemSetup;
 
 public class GenericComputerHostConfig : SadConsoleHostSystemConfigBase
 {
+    public const string ConfigSectionName = "Highbyte.DotNet6502.GenericComputer.SadConsole";
+
+    public GenericComputerSystemConfig SystemConfig
+    {
+        get { return (GenericComputerSystemConfig)base.SystemConfig; }
+        set { base.SystemConfig = value; }
+    }
+
+    public override bool AudioSupported => false;
+
+    private bool _isDirty = false;
+    [JsonIgnore]
+    public bool IsDirty => _isDirty || SystemConfig.IsDirty;
+    public void ClearDirty()
+    {
+        _isDirty = false;
+        SystemConfig.ClearDirty();
+    }
+
     public GenericComputerHostConfig()
     {
+        SystemConfig = new GenericComputerSystemConfig();
         Font = null;
         DefaultFontSize = IFont.Sizes.One;
     }
 
+    public override bool IsValid(out List<string> validationErrors)
+    {
+        validationErrors = new List<string>();
+
+        SystemConfig.IsValid(out var systemConfigValidationErrors);
+        validationErrors.AddRange(systemConfigValidationErrors);
+
+        return validationErrors.Count == 0;
+    }
+
     public new object Clone()
     {
         var clone = (GenericComputerHostConfig)MemberwiseClone();
+        clone.SystemConfig = (GenericComputerSystemConfig)SystemConfig.Clone();
         return clone;
     }
 }