Make the menus run synchronously

BitzArt · Jan 12, 2024 · f40d195 · f40d195
1 parent b9ce7ea
commit f40d195
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 65 deletions.
diff --git a/sample/BitzArt.Console.TestApp/Menus/0.MainMenu.cs b/sample/BitzArt.Console.TestApp/Menus/0.MainMenu.cs
@@ -4,8 +4,8 @@
 internal class MainMenu : ConsoleSelectionMenu
 {
     [MenuSelectionItem("Veggies")]
-    public async Task SubmenuVeggiesAsync()
+    public void NavigateToVeggiesMenu()
     {
-        await RunAsync<VeggiesMenu>();
+        Run<VeggiesMenu>();
     }
 }
diff --git a/sample/BitzArt.Console.TestApp/Menus/1.VeggiesMenu.cs b/sample/BitzArt.Console.TestApp/Menus/1.VeggiesMenu.cs
@@ -23,12 +23,12 @@ public void Potato()
         _focusOnPotato = true;
     }
 
-    protected override void OnSelectionBeforeInvoke(ConsoleSelectionMenuItem selection)
+    protected override void OnSelection(ConsoleSelectionMenuItem selection)
     {
         _focusOnPotato = false;
     }
 
-    protected override void OnSelection(ConsoleSelectionMenuItem selection)
+    protected override void OnSelectionInvoked(ConsoleSelectionMenuItem selection)
     {
         AnsiConsole.WriteLine($"You selected '{selection.Name}'");
 

diff --git a/src/BitzArt.Console/App/ConsoleApp.cs b/src/BitzArt.Console/App/ConsoleApp.cs
@@ -12,22 +12,22 @@ public ConsoleApp(IConsoleAppBuilder builder)
         Services = builder.Services.BuildServiceProvider();
     }
 
-    public void Run(CancellationToken cancellationToken = default)
+    public void Run()
     {
         var navigationManager = Services.GetRequiredService<IConsoleAppNavigationManager>();
-        navigationManager.NavigateToMainMenuAsync().Wait(cancellationToken);
+        navigationManager.NavigateToMainMenu();
     }
 
-    public void Run(Type mainMenuType, CancellationToken cancellationToken = default)
+    public void Run(Type mainMenuType)
     {
         var navigationManager = Services.GetRequiredService<IConsoleAppNavigationManager>();
-        navigationManager.NavigateAsync(mainMenuType).Wait(cancellationToken);
+        navigationManager.Navigate(mainMenuType);
     }
 
-    public void Run<TConsoleMenu>(CancellationToken cancellationToken = default) where TConsoleMenu : class
+    public void Run<TConsoleMenu>() where TConsoleMenu : class
     {
         var navigationManager = Services.GetRequiredService<IConsoleAppNavigationManager>();
-        navigationManager.NavigateAsync<TConsoleMenu>().Wait(cancellationToken);
+        navigationManager.Navigate<TConsoleMenu>();
     }
 
     public static IConsoleAppBuilder CreateBuilder()

diff --git a/src/BitzArt.Console/Extensions/RunConsoleMenuExtension.cs b/src/BitzArt.Console/Extensions/RunConsoleMenuExtension.cs
@@ -5,7 +5,7 @@ namespace BitzArt.Console;
 
 public static class RunConsoleMenuExtension
 {
-    internal static async Task RunConsoleMenuAsync<TConsoleMenu>(this IServiceProvider serviceProvider)
+    internal static void RunConsoleMenuAsync<TConsoleMenu>(this IServiceProvider serviceProvider)
         where TConsoleMenu : class
     {
         var menu = serviceProvider.GetRequiredService<TConsoleMenu>();
@@ -14,18 +14,18 @@ internal static async Task RunConsoleMenuAsync<TConsoleMenu>(this IServiceProvid
 
         consoleMenu.Populate(serviceProvider);
 
-        await consoleMenu.RunAsync();
+        consoleMenu.Run();
     }
 
-    internal static async Task RunConsoleMenuAsync(this IServiceProvider serviceProvider, Type menuType)
+    internal static void RunConsoleMenuAsync(this IServiceProvider serviceProvider, Type menuType)
     {
         var menu = serviceProvider.GetRequiredService(menuType);
 
         if (menu is not ConsoleMenu consoleMenu) return;
 
         consoleMenu.Populate(serviceProvider);
 
-        await consoleMenu.RunAsync();
+        consoleMenu.Run();
     }
 
     private static void Populate(this ConsoleMenu menu, IServiceProvider serviceProvider)

diff --git a/src/BitzArt.Console/Interfaces/IConsoleAppNavigationManager.cs b/src/BitzArt.Console/Interfaces/IConsoleAppNavigationManager.cs
@@ -2,7 +2,7 @@
 
 public interface IConsoleAppNavigationManager
 {
-    Task NavigateAsync(Type menuType);
-    Task NavigateAsync<T>() where T : class;
-    Task NavigateToMainMenuAsync();
+    public void Navigate(Type menuType);
+    public void Navigate<T>() where T : class;
+    public void NavigateToMainMenu();
 }
diff --git a/src/BitzArt.Console/Menus/ConsoleMenu.cs b/src/BitzArt.Console/Menus/ConsoleMenu.cs
@@ -12,22 +12,18 @@ public abstract class ConsoleMenu
 
     public bool? IsMainMenu { get; internal set; }
 
-    public async Task RunAsync()
+    public void Run()
     {
-        await RenderAsync();
+        Render();
     }
 
-    internal virtual async Task RenderAsync()
+    internal virtual void Render()
     {
         AnsiConsole.Clear();
         DisplayTitle();
 
         OnRender();
-        await OnRenderAsync();
-
-        await DisplayAsync();
-
-        await OnDisplayAsync();
+        Display();
         OnDisplay();
     }
 
@@ -37,32 +33,21 @@ internal virtual void DisplayTitle()
         AnsiConsole.WriteLine();
     }
 
-    protected virtual Task OnRenderAsync()
-    {
-        return Task.CompletedTask;
-    }
-
     protected virtual void OnRender()
     {
     }
 
-    internal virtual Task DisplayAsync()
-    {
-        return Task.CompletedTask;
-    }
-
-    protected virtual Task OnDisplayAsync()
+    internal virtual void Display()
     {
-        return Task.CompletedTask;
     }
 
     protected virtual void OnDisplay()
     {
     }
 
-    public async Task RunAsync<TConsoleMenu>() where TConsoleMenu : class
+    public void Run<TConsoleMenu>() where TConsoleMenu : class
     {
         var navigationManager = App!.Services.GetRequiredService<IConsoleAppNavigationManager>();
-        await navigationManager.NavigateAsync<TConsoleMenu>();
+        navigationManager.Navigate<TConsoleMenu>();
     }
 }
diff --git a/src/BitzArt.Console/Menus/ConsoleSelectionMenu.cs b/src/BitzArt.Console/Menus/ConsoleSelectionMenu.cs
@@ -11,24 +11,24 @@ public void AddSubmenu<TMenu>(string? selectionName = null)
         where TMenu : class
     {
         selectionName ??= typeof(TMenu).Name;
-        AddSelection(selectionName, async () => await RunAsync<TMenu>());
+        AddSelection(selectionName, Run<TMenu>);
     }
 
     public void AddSelection(string name, Action? action = null, bool pauseOnComplete = false)
     {
         SelectionItems.Add(new ConsoleSelectionMenuItem(name, action, pauseOnComplete));
     }
 
-    internal override async Task RenderAsync()
+    internal override void Render()
     {
         while(true)
         {
             if (_exiting) break;
-            await base.RenderAsync();
+            base.Render();
         }
     }
 
-    internal override async Task DisplayAsync()
+    internal override void Display()
     {
         var selectionPrompt = new SelectionPrompt<ConsoleSelectionMenuItem>();
 
@@ -46,23 +46,16 @@ internal override async Task DisplayAsync()
             return;
         }
 
-        await OnSelectionBeforeInvokeAsync(selected);
-        OnSelectionBeforeInvoke(selected);
+        OnSelection(selected);
 
         InvokeSelection(selected);
 
-        await OnSelectionAsync(selected);
-        OnSelection(selected);
+        OnSelectionInvoked(selected);
 
         AfterSelectionInvoked(selected);
     }
 
-    protected virtual Task OnSelectionBeforeInvokeAsync(ConsoleSelectionMenuItem selection)
-    {
-        return Task.CompletedTask;
-    }
-
-    protected virtual void OnSelectionBeforeInvoke(ConsoleSelectionMenuItem selection)
+    protected virtual void OnSelection(ConsoleSelectionMenuItem selection)
     {
     }
 
@@ -71,12 +64,7 @@ internal virtual void InvokeSelection(ConsoleSelectionMenuItem selection)
         selection.Action?.Invoke();
     }
 
-    protected virtual Task OnSelectionAsync(ConsoleSelectionMenuItem selection)
-    {
-        return Task.CompletedTask;
-    }
-
-    protected virtual void OnSelection(ConsoleSelectionMenuItem selection)
+    protected virtual void OnSelectionInvoked(ConsoleSelectionMenuItem selection)
     {
     }
 

diff --git a/src/BitzArt.Console/Services/ConsoleAppNavigationManager.cs b/src/BitzArt.Console/Services/ConsoleAppNavigationManager.cs
@@ -6,20 +6,20 @@ internal class ConsoleAppNavigationManager(IServiceProvider serviceProvider) : I
 {
     private readonly IServiceProvider _serviceProvider = serviceProvider;
 
-    public async Task NavigateToMainMenuAsync()
+    public void NavigateToMainMenu()
     {
         var map = _serviceProvider.GetRequiredService<MenuMap>();
         var mainMenu = map.GetMainMenuItem();
-        await _serviceProvider.RunConsoleMenuAsync(mainMenu.MenuType);
+        _serviceProvider.RunConsoleMenuAsync(mainMenu.MenuType);
     }
 
-    public async Task NavigateAsync<T>() where T : class
+    public void Navigate<T>() where T : class
     {
-        await _serviceProvider.RunConsoleMenuAsync<T>();
+        _serviceProvider.RunConsoleMenuAsync<T>();
     }
 
-    public async Task NavigateAsync(Type menuType)
+    public void Navigate(Type menuType)
     {
-        await _serviceProvider.RunConsoleMenuAsync(menuType);
+        _serviceProvider.RunConsoleMenuAsync(menuType);
     }
 }