Force support for NugetInstallJob

Author: Trojaner

src/Commands/CommandOpenMod.cs

@@ -14,7 +14,7 @@ public class CommandOpenMod : IRocketCommand
         private static readonly List<IJob> s_Jobs = new List<IJob>();
         private static readonly List<CommandWindowInputted> s_RocketModComandWindowsDelegates = new List<CommandWindowInputted>();
         private static CommandStep s_CurrentStep;
-
+        private static string[] s_Args;
         public void Execute(IRocketPlayer caller, string[] command)
         {
             if (command.Length < 1)
@@ -37,6 +37,8 @@ public void Execute(IRocketPlayer caller, string[] command)
             }
 
             Reset();
+
+            s_Args = command;
             Logger.Log("Starting OpenMod installation..", ConsoleColor.DarkCyan);
             Logger.Log("Visit https://openmod.github.io/openmod-docs for information.", ConsoleColor.DarkCyan);
             Logger.Log("Type \"cancel\" to cancel.", ConsoleColor.Cyan);
@@ -111,7 +113,7 @@ private void PerformMigration()
         {
             try
             {
-                JobsExecutor.Execute(s_Jobs);
+                JobsExecutor.Execute(s_Jobs, s_Args);
             }
             finally
             {
@@ -175,6 +177,7 @@ private void Reset()
             s_CurrentStep = null;
             s_Jobs.Clear();
             UnbindCommandInput();
+            s_Args = null;
         }
 
         // Some really shitty state machine

src/Jobs/IJob.cs

@@ -2,6 +2,6 @@
 {
     public interface IJob
     {
-        void ExecuteMigration();
+        void ExecuteMigration(string[] args);
     }
 }

src/Jobs/JobsExecutor.cs

@@ -6,7 +6,7 @@ namespace OpenMod.Installer.RocketMod.Jobs
 {
     public static class JobsExecutor
     {
-        public static bool Execute(List<IJob> jobsToExecute)
+        public static bool Execute(List<IJob> jobsToExecute, string[] args)
         {
             var executedJobs = new List<IJob>();
 
@@ -19,7 +19,7 @@ public static bool Execute(List<IJob> jobsToExecute)
                 try
                 {
                     executedJobs.Add(job);
-                    job.ExecuteMigration();
+                    job.ExecuteMigration(args);
                 }
                 catch (Exception e)
                 {

src/Jobs/MigrateEconomyJob.cs

@@ -4,7 +4,7 @@ namespace OpenMod.Installer.RocketMod.Jobs
 {
     public class MigrateEconomyJob : IJob
     {
-        public void ExecuteMigration()
+        public void ExecuteMigration(string[] args)
         {
             Logger.Log("Adding economy migration job to autoexec.yaml...");
             //todo check if job exists

src/Jobs/MigratePermissionsJob.cs

@@ -14,7 +14,7 @@ namespace OpenMod.Installer.RocketMod.Jobs
 {
     public class MigratePermissionsJob : IReversibleJob
     {
-        public void ExecuteMigration()
+        public void ExecuteMigration(string[] args)
         {
             Logger.Log("Importing RocketMod permissions to OpenMod...");
 

src/Jobs/NuGetInstallJob.cs

@@ -3,6 +3,7 @@
 using Rocket.Core.Logging;
 using System;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace OpenMod.Installer.RocketMod.Jobs
@@ -17,29 +18,35 @@ protected NuGetInstallJob(string packageId)
             m_PackageId = packageId;
         }
 
-        public void ExecuteMigration()
+        public void ExecuteMigration(string[] args)
         {
-            AsyncHelperEx.RunSync(DownloadPackage);
+            AsyncHelperEx.RunSync(() => DownloadPackage(args.Contains("--force") || args.Contains("-f")));
         }
 
-        private async Task DownloadPackage()
+        private async Task DownloadPackage(bool force)
         {
             Logger.Log($"Installing package \"{m_PackageId}\"...");
             var nuGetPackageManager = NuGetHelper.GetNuGetPackageManager();
 
             const bool c_AllowPreReleaseVersion = false;
 
             var oldIdentity = await nuGetPackageManager.GetLatestPackageIdentityAsync(m_PackageId);
-            if (oldIdentity != null)
+            if (!force && oldIdentity != null)
             {
-                Logger.Log($"Package \"{m_PackageId}\" is already installed.");
+                Logger.LogWarning($"Package \"{m_PackageId}\" is already installed, skipping. Use \"openmod install -f\" to install anyway.");
                 return;
             }
 
             var package = await nuGetPackageManager.QueryPackageExactAsync(m_PackageId, null, c_AllowPreReleaseVersion);
             if (package?.Identity == null)
             {
-                Logger.Log($"Downloading has failed for {m_PackageId}: {NuGetInstallCode.PackageOrVersionNotFound}");
+                Logger.LogError($"Downloading has failed for {m_PackageId}: {NuGetInstallCode.PackageOrVersionNotFound}");
+                return;
+            }
+
+            if (oldIdentity?.Version == package.Identity.Version && package.Identity.HasVersion)
+            {
+                Logger.LogError($"Latest version of {package.Identity.Id} is already installed.");
                 return;
             }
 

src/Jobs/OpenModAssemblyLoadJob.cs

@@ -13,7 +13,7 @@ public class OpenModAssemblyLoadJob : IReversibleJob
         private static readonly Dictionary<string, Assembly> s_LoadedAssemblies = new Dictionary<string, Assembly>();
         private static readonly Regex s_VersionRegex = new Regex("Version=(?<version>.+?), ", RegexOptions.Compiled);
 
-        public void ExecuteMigration()
+        public void ExecuteMigration(string[] args)
         {
             Logger.Log("Loading OpenMod assemblies. Ignore the message spam below.");
             var aviEvents = new List<AssemblyLoadEventHandler>();

src/Jobs/OpenModModuleInstallJob.cs

@@ -12,7 +12,7 @@ public class OpenModModuleInstallJob : IReversibleJob
     {
         private bool m_OpenModInstalledAlready;
 
-        public void ExecuteMigration()
+        public void ExecuteMigration(string[] args)
         {
             Logger.Log("Downloading and installing the OpenMod module.");
 
@@ -66,13 +66,19 @@ public void ExtractArchive(byte[] archive, string directory)
                 }
 
                 var path = Path.Combine(directory, Path.GetFileName(file.FilenameInZip));
+                try
+                {
+                    if (File.Exists(path))
+                    {
+                        File.Delete(path);
+                    }
 
-                if (File.Exists(path))
+                    zip.ExtractFile(file, path);
+                }
+                catch (Exception ex)
                 {
-                    File.Delete(path);
+                    Logger.LogWarning($"Failed to extract {file.FilenameInZip}: {ex.Message}.");
                 }
-
-                zip.ExtractFile(file, path);
             }
         }