integrated RndMnkIII's analogizer settings wizard (mattpannella#386)

* ported code from https://github.com/RndMnkIII/AnalogizerConfigurator/blob/main/Program.cs * combined menu * updated readme * woops * woops again * Update AnalogizerSettingsService.cs * cli stuff * move the file automatically
hallem · Feb 4, 2025 · 1948740 · 1948740
1 parent 1f10f77
commit 1948740
Show file tree

Hide file tree

Showing 7 changed files with 560 additions and 180 deletions.
diff --git a/MENU.md b/MENU.md
@@ -21,7 +21,9 @@
    4. Super GameBoy Aspect Ratio
       1. Apply 8:7 Aspect Ratio to Super GameBoy cores
       2. Restore 4:3 Aspect Ratio to Super GameBoy cores
-   5. Jotego Analogizer Config
+   5. Analogizer Config
+      1. Jotego Analogizer Config
+      2. Standard Analogizer Config
    6. Go Back
 7. Pocket Maintenance
    1. Update Selected

diff --git a/README.md b/README.md
@@ -374,6 +374,10 @@ Some archive.org sites require authentication to download the files. This makes
    -p, --path                 Absolute path to install location
    -c, --core                 The core you want to prune memories for
 
+  analogizer-setup         Run the setup wizard to generate Analogizer settings files (By default, runs the standard setup)
+   -p, --path                 Absolute path to install location
+   -j, --jotego               Run the setup for Jotego's cores
+
   update-self              Check for updates to pupdate
 
   help                     Display more information on a specific command.

diff --git a/src/Program.cs b/src/Program.cs
@@ -18,7 +18,8 @@ private static void Main(string[] args)
             var parserResult = parser.ParseArguments<MenuOptions, FundOptions, UpdateOptions,
                     AssetsOptions, FirmwareOptions, ImagesOptions, InstanceGeneratorOptions,
                     UpdateSelfOptions, UninstallOptions, BackupSavesOptions, GameBoyPalettesOptions,
-                    PocketLibraryImagesOptions, PocketExtrasOptions, DisplayModesOptions, PruneMemoriesOptions>(args)
+                    PocketLibraryImagesOptions, PocketExtrasOptions, DisplayModesOptions, PruneMemoriesOptions,
+                    AnalogizerSetupOptions>(args)
                 .WithNotParsed(errors =>
                 {
                     foreach (var error in errors)
@@ -213,6 +214,19 @@ private static void Main(string[] args)
                     AssetsService.PruneSaveStates(ServiceHelper.UpdateDirectory, options.CoreName);
                     break;
 
+                case AnalogizerSetupOptions options:
+                    if (options.Jotego)
+                    {
+                        JotegoAnalogizerSettingsService settings = new JotegoAnalogizerSettingsService();
+                        settings.RunAnalogizerSettings();
+                        Console.WriteLine("Jotego Analogizer configuration updated.");
+                    }
+                    else 
+                    {
+                        AnalogizerSettingsService.ShowWizard();
+                    }
+                    break;
+
                 default:
                     DisplayMenu(coreUpdaterService);
                     break;

diff --git a/src/options/AnalogizerSetupOptions.cs b/src/options/AnalogizerSetupOptions.cs
@@ -0,0 +1,10 @@
+using CommandLine;
+
+namespace Pannella.Options;
+
+[Verb("analogizer-setup",  HelpText = "Set up Analogizer options")]
+public class AnalogizerSetupOptions : BaseOptions
+{
+    [Option ('j', "jotego", Required = false, HelpText = "Run the setup for Jotego's cores.")]
+    public bool Jotego { get; set; } = false;
+}
diff --git a/src/partials/Program.Menus.cs b/src/partials/Program.Menus.cs
@@ -172,22 +172,38 @@ private static void DisplayMenu(CoreUpdaterService coreUpdaterService)
 
         #endregion
 
-        #region Pocket Setup
+        #region Analogizer Setup
 
-        var pocketSetupMenu = new ConsoleMenu()
+        var analogizerMenu = new ConsoleMenu()
             .Configure(menuConfig)
-            .Add("Manage Display Modes         >", displayModesMenu.Show)
-            .Add("Download Images and Palettes >", downloadFilesMenu.Show)
-            .Add("Generate ROMs & JSON Files   >", generateFilesMenu.Show)
-            .Add("Super GameBoy Aspect Ratio   >", sgbAspectRatioMenu.Show)
             .Add("Jotego Analogizer Config", _=>
             {
-                AnalogizerSettingsService settings = new AnalogizerSettingsService();
+                JotegoAnalogizerSettingsService settings = new JotegoAnalogizerSettingsService();
                 settings.RunAnalogizerSettings();
 
+                Console.WriteLine("Jotego Analogizer configuration updated.");
+                Pause();
+            })
+            .Add("Standard Analogizer Config", _=>
+            {
+                AnalogizerSettingsService.ShowWizard();
+
                 Console.WriteLine("Analogizer configuration updated.");
                 Pause();
             })
+            .Add("Go Back", ConsoleMenu.Close);
+
+        #endregion
+
+        #region Pocket Setup
+
+        var pocketSetupMenu = new ConsoleMenu()
+            .Configure(menuConfig)
+            .Add("Manage Display Modes         >", displayModesMenu.Show)
+            .Add("Download Images and Palettes >", downloadFilesMenu.Show)
+            .Add("Generate ROMs & JSON Files   >", generateFilesMenu.Show)
+            .Add("Super GameBoy Aspect Ratio   >", sgbAspectRatioMenu.Show)
+            .Add("Analogizer Config            >", analogizerMenu.Show)
             .Add("Set Patreon Email Address", () =>
             {
                 Console.WriteLine($"Current email address: {ServiceHelper.SettingsService.Config.patreon_email_address}");