chore: refactor codebase

- add namespace
- move commands to dedicated file
- collapse linux shells to single process info

src/Commands.cs

@@ -0,0 +1,98 @@
+using System.ComponentModel;
+
+using Spectre.Console;
+using Spectre.Console.Cli;
+
+namespace ScriptLauncher;
+
+internal sealed class RootCommand : AsyncCommand<RootCommandSettings>
+    {
+        private const int Failure = 1;
+        private const int Success = 0;
+
+        public override async Task<int> ExecuteAsync(
+            CommandContext context,
+            RootCommandSettings settings
+        )
+        {
+            if (!Directory.Exists(settings.Directory))
+            {
+                AnsiConsole.Markup($"[red]The directory '{settings.Directory}' does not exist.[/]");
+                return Failure;
+            }
+
+            FileInfo[] files;
+            var finder = new ScriptFinder(settings.Extensions, settings.Directory, settings.Depth);
+
+            if (settings.Group)
+            {
+                var dict = finder.GetScriptsByDirectory();
+
+                if (dict.Count == 0)
+                {
+                    AnsiConsole.Markup(
+                        $"[red]No scripts script files found in '{finder.RootDirectory}' with extensions '{string.Join(", ", finder.Extensions)}'[/]"
+                    );
+                    return Failure;
+                }
+
+                var dirPrompt = PromptConstructor.GetDirectoryPrompt(dict.Keys.ToArray());
+                var directoryInfo = AnsiConsole.Prompt(dirPrompt);
+                files = dict[directoryInfo];
+            }
+            else
+            {
+                files = finder.GetScripts();
+            }
+
+            if (files.Length == 0)
+            {
+                AnsiConsole.Markup(
+                    $"[red]No scripts script files found in '{finder.RootDirectory}' with extensions '{string.Join(", ", finder.Extensions)}'[/]"
+                );
+                return Failure;
+            }
+
+            var prompt = PromptConstructor.GetScriptPrompt(files, settings.Brief);
+            var scripts = AnsiConsole.Prompt(prompt);
+
+            try
+            {
+                await ScriptExecutor.ExecAsync(scripts, settings.Elevated);
+            }
+            catch (Exception ex) when (ex is Win32Exception or InvalidOperationException or PlatformNotSupportedException)
+            {
+                AnsiConsole.Markup($"[red]{ex.Message}[/]");
+                return Failure;
+            }
+
+            return Success;
+        }
+    }
+
+    internal class RootCommandSettings : CommandSettings
+    {
+        [Description("Comma separated list of script extensions")]
+        [CommandOption("-x|--extensions")]
+        public string? Extensions { get; init; }
+
+        [Description("Search depth")]
+        [CommandOption("-d|--depth")]
+        public int Depth { get; init; } = 1;
+
+        [Description("Run with elevated privileges")]
+        [CommandOption("-e|--elevated")]
+        public bool Elevated { get; init; } = false;
+
+        [Description("Group scripts by folder")]
+        [CommandOption("-g|--group")]
+        public bool Group { get; init; } = false;
+
+        [Description("Show brief information")]
+        [CommandOption("-b|--brief")]
+        public bool Brief { get; init; } = false;
+
+        [Description("Starting directory (Default: .)")]
+        [CommandArgument(0, "<path>")]
+        public string Directory { get; init; } = ".";
+    }

src/Program.cs

@@ -1,93 +1,6 @@
-using System.ComponentModel;
+using ScriptLauncher;
-using System.Diagnostics.CodeAnalysis;
-using Spectre.Console;
 using Spectre.Console.Cli;
 
 var app = new CommandApp<RootCommand>();
 app.Configure(x => x.SetApplicationName("scrl"));
 return app.Run(args);
-
-sealed class RootCommand : AsyncCommand<RootCommandSettings>
-{
-    private const int Failure = 1;
-    private const int Success = 0;
-
-    public override async Task<int> ExecuteAsync(
-        [NotNull] CommandContext context,
-        [NotNull] RootCommandSettings settings
-    )
-    {
-        if (!Directory.Exists(settings.Directory))
-        {
-            AnsiConsole.Markup($"[red]The directory '{settings.Directory}' does not exist.[/]");
-            // Environment.ExitCode = 1;
-            return Failure;
-        }
-
-        FileInfo[] files;
-        var finder = new ScriptFinder(settings.Extensions, settings.Directory, settings.Depth);
-
-        if (settings.Group)
-        {
-            var dict = finder.GetScriptsByDirectory();
-
-            if (dict.Count == 0)
-            {
-                AnsiConsole.Markup(
-                    $"[red]No scripts script files found in '{finder.RootDirectory}' with extensions '{string.Join(", ", finder.Extensions)}'[/]"
-                );
-                return Failure;
-            }
-
-            var dirPrompt = PromptConstructor.GetDirectoryPrompt(dict.Keys.ToArray());
-            var directoryInfo = AnsiConsole.Prompt(dirPrompt);
-            files = dict[directoryInfo];
-        }
-        else
-        {
-            files = finder.GetScripts();
-        }
-
-        if (files.Length == 0)
-        {
-            AnsiConsole.Markup(
-                $"[red]No scripts script files found in '{finder.RootDirectory}' with extensions '{string.Join(", ", finder.Extensions)}'[/]"
-            );
-            return Failure;
-        }
-
-        var prompt = PromptConstructor.GetScriptPrompt(files, settings.Brief);
-        var scripts = AnsiConsole.Prompt(prompt);
-
-        await ScriptExecutor.ExecAsync(scripts, settings.Elevated);
-
-        return Success;
-    }
-}
-
-internal class RootCommandSettings : CommandSettings
-{
-    [Description("Comma separated list of script extensions")]
-    [CommandOption("-x|--extensions")]
-    public string? Extensions { get; init; }
-
-    [Description("Search depth")]
-    [CommandOption("-d|--depth")]
-    public int Depth { get; init; } = 1;
-
-    [Description("Run with elevated privileges")]
-    [CommandOption("-e|--elevated")]
-    public bool Elevated { get; init; } = false;
-
-    [Description("Group scripts by folder")]
-    [CommandOption("-g|--group")]
-    public bool Group { get; init; } = false;
-
-    [Description("Show brief information")]
-    [CommandOption("-b|--brief")]
-    public bool Brief { get; init; } = false;
-
-    [Description("Starting directory (Default: .)")]
-    [CommandArgument(0, "<path>")]
-    public string Directory { get; init; } = ".";
-}

src/PromptConstructor.cs

@@ -1,11 +1,14 @@
 using System.Text;
 using Spectre.Console;
 
-static class PromptConstructor
+namespace ScriptLauncher;
+
+internal static class PromptConstructor
 {
     const int ScriptListSize = 15;
 
-    private static Style SelectionHighlight => new(decoration: Decoration.Bold | Decoration.Underline);
+    private static Style SelectionHighlight =>
+        new(decoration: Decoration.Bold | Decoration.Underline);
 
     private static string FileStyle(FileInfo info, bool brief)
     {
@@ -28,14 +31,16 @@ static class PromptConstructor
     public static MultiSelectionPrompt<FileInfo> GetScriptPrompt(FileInfo[] files, bool brief)
     {
         var prompt = new MultiSelectionPrompt<FileInfo>()
-        .Title("Select the scripts to execute:")
+            .Title("Select the scripts to execute:")
-        .NotRequired()
+            .NotRequired()
-        .PageSize(ScriptListSize)
+            .PageSize(ScriptListSize)
-        .InstructionsText("[grey](Press [blue]<space>[/] to toggle a script, [green]<enter>[/] to accept)[/]")
+            .InstructionsText(
-        .MoreChoicesText("[grey]Move up and down to reveal more options[/]")
+                "[grey](Press [blue]<space>[/] to toggle a script, [green]<enter>[/] to accept)[/]"
-        .UseConverter(x => FileStyle(x, brief))
+            )
-        .HighlightStyle(SelectionHighlight)
+            .MoreChoicesText("[grey]Move up and down to reveal more options[/]")
-        .AddChoices(files);
+            .UseConverter(x => FileStyle(x, brief))
+            .HighlightStyle(SelectionHighlight)
+            .AddChoices(files);
 
         return prompt;
     }
@@ -43,12 +48,12 @@ static class PromptConstructor
     public static SelectionPrompt<DirectoryInfo> GetDirectoryPrompt(DirectoryInfo[] directories)
     {
         var prompt = new SelectionPrompt<DirectoryInfo>()
-        .Title("Select a directory:")
+            .Title("Select a directory:")
-        .PageSize(ScriptListSize)
+            .PageSize(ScriptListSize)
-        .MoreChoicesText("[grey]Move up and down to reveal more options[/]")
+            .MoreChoicesText("[grey]Move up and down to reveal more options[/]")
-        .UseConverter(DirectoryStyle)
+            .UseConverter(DirectoryStyle)
-        .HighlightStyle(SelectionHighlight)
+            .HighlightStyle(SelectionHighlight)
-        .AddChoices(directories);
+            .AddChoices(directories);
 
         return prompt;
     }

src/ScriptExecutor.cs

@@ -1,70 +1,46 @@
-using System.ComponentModel;
 using System.Diagnostics;
-using Spectre.Console;
 
-static class ScriptExecutor
+namespace ScriptLauncher;
+
+internal static class ScriptExecutor
 {
-    public static async Task ExecAsync(List<FileInfo> files, bool elevated)
+    public static async Task ExecAsync(List<FileInfo> files, bool elevated) => 
-    {
         await Parallel.ForEachAsync(files, (x, ct) => ExecAsync(x, elevated, ct));
-    }
 
-    public static async ValueTask ExecAsync(FileInfo file, bool elevated, CancellationToken cancellationToken = default)
+    private static async ValueTask ExecAsync(FileInfo file, bool elevated, CancellationToken cancellationToken = default)
     {
         var process = GetExecutableProcessInfo(file, elevated);
-
+        if (process is null)
-        if (process is null) return;
-
-        try
         {
-            await (Process.Start(process)?.WaitForExitAsync(cancellationToken) ?? Task.CompletedTask);
+            return;
-        }
-        catch (Exception ex) when (ex is Win32Exception or InvalidOperationException or PlatformNotSupportedException)
-        {
-            AnsiConsole.Markup($"[red]{ex.Message}[/]");
         }
+        
+        await (Process.Start(process)?.WaitForExitAsync(cancellationToken) ?? Task.CompletedTask);
     }
 
-    private static ProcessStartInfo? GetExecutableProcessInfo(FileInfo file, bool elevated)
+    private static ProcessStartInfo? GetExecutableProcessInfo(FileInfo file, bool elevated) => file.Extension switch
     {
-        return file.Extension switch
+        ".bat" or ".cmd" => new ProcessStartInfo
         {
-            ".bat" or ".cmd" => new ProcessStartInfo
+            FileName = "cmd",
-            {
+            Arguments = $"/Q /C .\\{file.Name}",
-                FileName = "cmd",
+            Verb = elevated ? "runas /user:Administrator" : string.Empty,
-                Arguments = $"/Q /C .\\{file.Name}",
+            WorkingDirectory = file.DirectoryName
-                Verb = elevated ? "runas /user:Administrator" : string.Empty,
+        },
-                WorkingDirectory = file.DirectoryName
+        ".ps1" => new ProcessStartInfo
-            },
+        {
-            ".ps1" => new ProcessStartInfo
+            FileName = "powershell.exe",
-            {
+            Arguments = $"-ExecutionPolicy Bypass -File .\\{file.Name}",
-                FileName = "powershell.exe",
+            Verb = elevated ? "runas /user:Administrator" : string.Empty,
-                Arguments = $"-ExecutionPolicy Bypass -File .\\{file.Name}",
+            WorkingDirectory = file.DirectoryName
-                Verb = elevated ? "runas /user:Administrator" : string.Empty,
+        },
-                WorkingDirectory = file.DirectoryName
+        ".sh" or ".zsh" or ".fish" => new ProcessStartInfo
-            },
+        {
-            ".sh" => new ProcessStartInfo
+            FileName = "sh",
-            {
+            Arguments = $"-c ./{file.Name}",
-                FileName = "bash",
+            Verb = elevated ? "sudo" : string.Empty,
-                Arguments = $"-c ./{file.Name}",
+            WorkingDirectory = file.DirectoryName
-                Verb = elevated ? "sudo" : string.Empty,
+        },
-                WorkingDirectory = file.DirectoryName
+        var _ => null
-            },
+    };
-            ".zsh" => new ProcessStartInfo
+}
-            {
-                FileName = "zsh",
-                Arguments = $"-c ./{file.Name}",
-                Verb = elevated ? "sudo" : string.Empty,
-                WorkingDirectory = file.DirectoryName
-            },
-            ".fish" => new ProcessStartInfo
-            {
-                FileName = "fish",
-                Arguments = $"-c ./{file.Name}",
-                Verb = elevated ? "sudo" : string.Empty,
-                WorkingDirectory = file.DirectoryName
-            },
-            _ => null
-        };
-    }
-}

src/ScriptFinder.cs

@@ -1,6 +1,6 @@
-using Spectre.Console;
+namespace ScriptLauncher;
 
-readonly struct ScriptFinder
+internal readonly struct ScriptFinder
 {
     static readonly string[] DefaultExtensions = new[] { ".ps1", ".*sh", ".bat", ".cmd" };
     public string[] Extensions { get; }
@@ -10,10 +10,12 @@ readonly struct ScriptFinder
 
     public ScriptFinder(string? extensions, string directory, int depth)
     {
-        Extensions = extensions?.Split(new[] { ',', ' ' }, StringSplitOptions.RemoveEmptyEntries)
+        Extensions =
-        .ToHashSet()
+            extensions
-        .Select(x => $".{x.TrimStart('.')}")
+                ?.Split(new[] { ',', ' ' }, StringSplitOptions.RemoveEmptyEntries)
-        .ToArray() ?? DefaultExtensions;
+                .ToHashSet()
+                .Select(x => $".{x.TrimStart('.')}")
+                .ToArray() ?? DefaultExtensions;
 
         Depth = depth;
         RootDirectory = directory;
@@ -44,9 +46,9 @@ readonly struct ScriptFinder
 
     public IDictionary<DirectoryInfo, FileInfo[]> GetScriptsByDirectory() =>
         Extensions
-        .Select(GetScriptFilesWithExtension)
+            .Select(GetScriptFilesWithExtension)
-        .SelectMany(x => x)
+            .SelectMany(x => x)
-        .GroupBy(x => x.DirectoryName!)
+            .GroupBy(x => x.DirectoryName!)
-        .OrderBy(x => x.Key)
+            .OrderBy(x => x.Key)
-        .ToDictionary(x => new DirectoryInfo(x.Key), x => x.ToArray());
+            .ToDictionary(x => new DirectoryInfo(x.Key), x => x.ToArray());
 }