From 17e99dd0c221b637c09811b7bf66a92c540d9d84 Mon Sep 17 00:00:00 2001 From: Marcello Lamonaca Date: Thu, 20 Jul 2023 14:29:47 +0200 Subject: [PATCH] chore: enable .NET analyzers --- src/Commands.cs | 142 +++++++++++++++++++------------------- src/PromptConstructor.cs | 13 +++- src/ScriptLauncher.csproj | 3 +- 3 files changed, 84 insertions(+), 74 deletions(-) diff --git a/src/Commands.cs b/src/Commands.cs index 5337cc6..7d0c5a5 100644 --- a/src/Commands.cs +++ b/src/Commands.cs @@ -6,46 +6,29 @@ using Spectre.Console.Cli; namespace ScriptLauncher; internal sealed class RootCommand : AsyncCommand +{ + private const int Failure = 1; + private const int Success = 0; + + public override async Task ExecuteAsync( + CommandContext context, + RootCommandSettings settings + ) { - private const int Failure = 1; - private const int Success = 0; - - public override async Task ExecuteAsync( - CommandContext context, - RootCommandSettings settings - ) + if (!Directory.Exists(settings.Directory)) { - if (!Directory.Exists(settings.Directory)) - { - AnsiConsole.Markup($"[red]The directory '{settings.Directory}' does not exist.[/]"); - return Failure; - } + AnsiConsole.Markup($"[red]The directory '{settings.Directory}' does not exist.[/]"); + return Failure; + } - FileInfo[] files; - var finder = new ScriptFinder(settings.Extensions, settings.Directory, settings.Depth); + FileInfo[] files; + var finder = new ScriptFinder(settings.Extensions, settings.Directory, settings.Depth); - if (settings.Group) - { - var dict = finder.GetScriptsByDirectory(); + 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) + if (dict.Count == 0) { AnsiConsole.Markup( $"[red]No scripts script files found in '{finder.RootDirectory}' with extensions '{string.Join(", ", finder.Extensions)}'[/]" @@ -53,46 +36,65 @@ internal sealed class RootCommand : AsyncCommand 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; + 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).ConfigureAwait(false); + } + 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; } +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("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("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("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("Show brief information")] + [CommandOption("-b|--brief")] + public bool Brief { get; init; } = false; - [Description("Starting directory (Default: .)")] - [CommandArgument(0, "")] - public string Directory { get; init; } = "."; - } + [Description("Starting directory (Default: .)")] + [CommandArgument(0, "")] + public string Directory { get; init; } = "."; +} diff --git a/src/PromptConstructor.cs b/src/PromptConstructor.cs index 8c0952e..baa6137 100644 --- a/src/PromptConstructor.cs +++ b/src/PromptConstructor.cs @@ -1,3 +1,4 @@ +using System.Globalization; using System.Text; using Spectre.Console; @@ -16,12 +17,18 @@ internal static class PromptConstructor if (!brief) { - builder.Append($"[blue]{info.DirectoryName}{Path.DirectorySeparatorChar}[/]"); + builder.Append( + CultureInfo.InvariantCulture, + $"[blue]{info.DirectoryName}{Path.DirectorySeparatorChar}[/]" + ); } builder - .Append($"[orangered1]{Path.GetFileNameWithoutExtension(info.Name)}[/]") - .Append($"[greenyellow]{info.Extension}[/]"); + .Append( + CultureInfo.InvariantCulture, + $"[orangered1]{Path.GetFileNameWithoutExtension(info.Name)}[/]" + ) + .Append(CultureInfo.InvariantCulture, $"[greenyellow]{info.Extension}[/]"); return builder.ToString(); } diff --git a/src/ScriptLauncher.csproj b/src/ScriptLauncher.csproj index c293f25..1b1bd1d 100644 --- a/src/ScriptLauncher.csproj +++ b/src/ScriptLauncher.csproj @@ -5,7 +5,8 @@ net6.0 enable enable - 0.1.3 + All + 0.1.4 true Tool to find and exec shell scripts README.md