make lambdas static where possible

README.md

@@ -33,18 +33,19 @@ _**NOTE**_: The option `-p:PublishTrimmed=true` may produce some *warnings*. If
 
 ```sh
 USAGE:
-    scrl <path> [OPTIONS]
+    scrl [path] [OPTIONS]
 
 ARGUMENTS:
-    <path>    Starting directory (Default: .)
+    [path]    Starting directory (Default: .)
 
 OPTIONS:
-    -h, --help          Prints help information
+                                     DEFAULT
-    -x, --extensions    Comma separated list of script extensions
+    -h, --help                                  Prints help information
-    -d, --depth         Search depth
+    -x, --extensions <EXTENSIONS>               List of script extensions to search for
-    -e, --elevated      Run with elevated privileges
+    -d, --depth                      3          Search depth
-    -g, --group         Group scripts by folder
+    -e, --elevated                              Run with elevated privileges
-    -b, --brief         Show brief information
+    -g, --group                                 Group scripts by folder
+    -b, --brief                                 Show brief information
 ```
 
 [CLI]: https://docs.microsoft.com/en-us/dotnet/core/tools/ ".NET CLI Docs"

src/Commands.cs

@@ -1,5 +1,5 @@
 using System.ComponentModel;
-
+using System.Diagnostics.CodeAnalysis;
 using Spectre.Console;
 using Spectre.Console.Cli;
 
@@ -76,27 +76,30 @@ public sealed class RootCommand : AsyncCommand<RootCommandSettings>
 
 public sealed class RootCommandSettings : CommandSettings
 {
-    [Description("Comma separated list of script extensions")]
+    [Description("List of script extensions to search for")]
-    [CommandOption("-x|--extensions")]
+    [CommandOption("-x|--extensions <EXTENSIONS>")]
-    public string? Extensions { get; init; }
+    [SuppressMessage("Performance", "CA1819:Properties should not return arrays")]
+    public string[] Extensions { get; init; } = [".ps1", ".*sh", ".bat", ".cmd", ".nu"];
 
     [Description("Search depth")]
     [CommandOption("-d|--depth")]
-    public int Depth { get; init; } = 1;
+    [DefaultValue(3)]
+    public int Depth { get; init; }
 
     [Description("Run with elevated privileges")]
     [CommandOption("-e|--elevated")]
-    public bool Elevated { get; init; } = false;
+    public bool Elevated { get; init; }
 
     [Description("Group scripts by folder")]
     [CommandOption("-g|--group")]
-    public bool Group { get; init; } = false;
+    public bool Group { get; init; }
 
     [Description("Show brief information")]
     [CommandOption("-b|--brief")]
-    public bool Brief { get; init; } = false;
+    public bool Brief { get; init; }
 
     [Description("Starting directory (Default: .)")]
-    [CommandArgument(0, "<path>")]
+    [CommandArgument(0, "[path]")]
-    public string Directory { get; init; } = ".";
+    [DefaultValue(".")]
-}
+    public string Directory { get; init; } = string.Empty;
+}

src/Program.cs

@@ -2,5 +2,6 @@ using ScriptLauncher;
 using Spectre.Console.Cli;
 
 var app = new CommandApp<RootCommand>();
-app.Configure(x => x.SetApplicationName("scrl"));
+app.Configure(static x => x.SetApplicationName("scrl"));
+
 return app.Run(args);

src/ScriptFinder.cs

@@ -2,23 +2,15 @@ namespace ScriptLauncher;
 
 internal readonly struct ScriptFinder
 {
-    private static readonly string[] DefaultExtensions = new[] { ".ps1", ".*sh", ".bat", ".cmd", ".nu" };
+    public IEnumerable<string> Extensions { get; }
-    private static readonly char[] DefaultSeparators = new[] { ',', ' ' };
-
-    public string[] Extensions { get; }
     public string RootDirectory { get; }
-    public int Depth { get; }
+    private int Depth { get; }
 
     private readonly EnumerationOptions _options;
 
-    public ScriptFinder(string? extensions, string directory, int depth)
+    public ScriptFinder(IEnumerable<string> extensions, string directory, int depth)
     {
-        Extensions =
+        Extensions = extensions.ToHashSet().Select(static x => $".{x.TrimStart('.')}");
-            extensions
-                ?.Split(DefaultSeparators, StringSplitOptions.RemoveEmptyEntries)
-                .ToHashSet()
-                .Select(x => $".{x.TrimStart('.')}")
-                .ToArray() ?? DefaultExtensions;
 
         Depth = depth;
         RootDirectory = directory;
@@ -36,7 +28,7 @@ internal readonly struct ScriptFinder
         try
         {
             var filenames = Directory.GetFiles(RootDirectory, $"*{extension}", _options);
-            return filenames.Select(x => new FileInfo(x));
+            return filenames.Select(static x => new FileInfo(x));
         }
         catch (UnauthorizedAccessException)
         {
@@ -45,13 +37,13 @@ internal readonly struct ScriptFinder
     }
 
     public FileInfo[] GetScripts() =>
-        Extensions.Select(GetScriptFilesWithExtension).SelectMany(x => x).ToArray();
+        Extensions.Select(GetScriptFilesWithExtension).SelectMany(static x => x).ToArray();
 
     public IDictionary<DirectoryInfo, FileInfo[]> GetScriptsByDirectory() =>
         Extensions
             .Select(GetScriptFilesWithExtension)
-            .SelectMany(x => x)
+            .SelectMany(static x => x)
-            .GroupBy(x => x.DirectoryName!)
+            .GroupBy(static x => x.DirectoryName!)
-            .OrderBy(x => x.Key)
+            .OrderBy(static x => x.Key)
-            .ToDictionary(x => new DirectoryInfo(x.Key), x => x.ToArray());
+            .ToDictionary(static x => new DirectoryInfo(x.Key), static x => x.ToArray());
 }

src/ScriptLauncher.csproj

@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AnalysisMode>All</AnalysisMode>
-    <Version>0.1.6</Version>
+    <Version>0.1.7</Version>
     <PackAsTool>true</PackAsTool>
     <Description>Tool to find and exec shell scripts</Description>
     <PackageReadmeFile>README.md</PackageReadmeFile>