Default restore to global install, add local flag

Author: MattKotsenas

src/dnvm/CommandLineArguments.cs

@@ -174,9 +174,17 @@ public sealed partial record PruneCommand : DnvmSubCommand
     }
 
     [Command("restore", Summary = "Restore the SDK listed in the global.json file.",
-        Description = "Downloads the SDK in the global.json in or above the current directory to the .dotnet folder in the same directory.")]
+        Description = "Downloads the SDK in the global.json in or above the current directory.")]
     public sealed partial record RestoreCommand : DnvmSubCommand
     {
+        [CommandOption("-l|--local", Description = "Install the sdk into the .dotnet folder in the same directory as global.json.")]
+        public bool? Local { get; init; } = null;
+
+        [CommandOption("-f|--force", Description = "Force install the SDK, even if already installed.")]
+        public bool? Force { get; init; } = null;
+
+        [CommandOption("-v|--verbose", Description = "Print extra debugging info to the console.")]
+        public bool? Verbose { get; init; } = null;
     }
 
     /// <summary>
@@ -310,7 +318,12 @@ public sealed record PruneArguments : CommandArguments
         public bool DryRun { get; init; } = false;
     }
 
-    public sealed record RestoreArguments : CommandArguments;
+    public sealed record RestoreArguments : CommandArguments
+    {
+        public bool Local { get; init; } = false;
+        public bool Force { get; init; } = false;
+        public bool Verbose { get; init; } = false;
+    }
 }
 
 public sealed record class CommandLineArguments(CommandArguments? Command)
@@ -434,7 +447,12 @@ public static CommandLineArguments ParseRaw(IAnsiConsole console, string[] args)
             }
             case DnvmSubCommand.RestoreCommand r:
             {
-                return new CommandLineArguments(new CommandArguments.RestoreArguments());
+                return new CommandLineArguments(new CommandArguments.RestoreArguments
+                {
+                    Local = r.Local ?? false,
+                    Force = r.Force ?? false,
+                    Verbose = r.Verbose ?? false,
+                });
             }
             case null:
             {

src/dnvm/Program.cs

@@ -67,7 +67,7 @@ internal static async Task<int> Dnvm(DnvmEnv env, Logger logger, CommandLineArgu
             CommandArguments.UntrackArguments o => await UntrackCommand.Run(env, logger, o),
             CommandArguments.UninstallArguments o => await UninstallCommand.Run(env, logger, o),
             CommandArguments.PruneArguments args => await PruneCommand.Run(env, logger, args),
-            CommandArguments.RestoreArguments => await RestoreCommand.Run(env, logger) switch {
+            CommandArguments.RestoreArguments o => await RestoreCommand.Run(env, logger, o) switch {
                 Result<SemVersion, RestoreCommand.Error>.Ok => 0,
                 Result<SemVersion, RestoreCommand.Error>.Err x => (int)x.Value,
             },

src/dnvm/RestoreCommand.cs

@@ -128,7 +128,7 @@ public enum Error
         CantFindRequestedVersion = 6,
     }
 
-    public static async Task<Result<SemVersion, Error>> Run(DnvmEnv env, Logger logger)
+    public static async Task<Result<SemVersion, Error>> Run(DnvmEnv env, Logger logger, CommandArguments.RestoreArguments options)
     {
         UPath? globalJsonPathOpt = null;
         UPath cwd = env.Cwd;
@@ -228,10 +228,21 @@ public static async Task<Result<SemVersion, Error>> Run(DnvmEnv env, Logger logg
 
         var downloadUrl = component.Files.Single(f => f.Rid == Utilities.CurrentRID.ToString() && f.Url.EndsWith(Utilities.ZipSuffix)).Url;
 
-        var error = await InstallCommand.InstallSdkToDir(env.HttpClient, downloadUrl, env.CwdFs, installDir, env.TempFs, logger);
-        if (error is not null)
+        if (options.Local)
         {
-            return Error.IoError;
+            var error = await InstallCommand.InstallSdkToDir(env.HttpClient, downloadUrl, env.CwdFs, installDir, env.TempFs, logger);
+            if (error is not null)
+            {
+                return Error.IoError;
+            }
+        }
+        else
+        {
+            var error = await InstallCommand.Run(env, logger, new CommandArguments.InstallArguments { SdkVersion = component.Version, Force = options.Force, Verbose = options.Verbose });
+            if (error != InstallCommand.Result.Success)
+            {
+                return Error.IoError;
+            }
         }
 
         return component.Version;

test/UnitTests/CommandLineTests.cs

@@ -447,12 +447,15 @@ public void RestoreHelp(string param)
             console,
             [ "restore", param ]).Command);
         Assert.Equal("""
-usage: dnvm restore [-h | --help]
+usage: dnvm restore [-l | --local] [-f | --force] [-v | --verbose] [-h | --help]
 
-Downloads the SDK in the global.json in or above the current directory to the
-.dotnet folder in the same directory.
+Downloads the SDK in the global.json in or above the current directory.
 
 Options:
+    -l, --local  Install the sdk into the .dotnet folder in the same directory
+as global.json.
+    -f, --force  Force install the SDK, even if already installed.
+    -v, --verbose  Print extra debugging info to the console.
     -h, --help  Show help information.