Merge #4067 Treat mods with missing files as upgradeable/reinstallable

CHANGELOG.md

@@ -21,6 +21,7 @@ All notable changes to this project will be documented in this file.
 - [ConsoleUI] Add downloads column for ConsoleUI (#4063 by: HebaruSan)
 - [ConsoleUI] Play game option for ConsoleUI (#4064 by: HebaruSan)
 - [ConsoleUI] ConsoleUI prompt to delete non-empty folders after uninstall (#4066 by: HebaruSan)
+- [Multiple] Treat mods with missing files as upgradeable/reinstallable (#4067 by: HebaruSan)
 
 ### Bugfixes
 

Cmdline/Action/List.cs

@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -55,7 +54,7 @@ public int RunCommand(CKAN.GameInstance instance, object raw_options)
             {
                 var installed = new SortedDictionary<string, ModuleVersion>(registry.Installed());
                 var upgradeable = registry
-                                  .CheckUpgradeable(instance.VersionCriteria(), new HashSet<string>())
+                                  .CheckUpgradeable(instance, new HashSet<string>())
                                   [true]
                                   .Select(m => m.identifier)
                                   .ToHashSet();

Cmdline/Action/Upgrade.cs

@@ -121,7 +121,7 @@ public int RunCommand(CKAN.GameInstance instance, object raw_options)
                 if (options.upgrade_all)
                 {
                     var to_upgrade = registry
-                                     .CheckUpgradeable(instance.VersionCriteria(), new HashSet<string>())
+                                     .CheckUpgradeable(instance, new HashSet<string>())
                                      [true];
                     if (to_upgrade.Count == 0)
                     {
@@ -225,7 +225,7 @@ private void UpgradeModules(GameInstanceManager manager,
                                                     .ToList();
                     // Modules allowed by THOSE modules' relationships
                     var upgradeable = registry
-                                      .CheckUpgradeable(crit, heldIdents, limiters)
+                                      .CheckUpgradeable(instance, heldIdents, limiters)
                                       [true]
                                       .ToDictionary(m => m.identifier,
                                                     m => m);

ConsoleUI/InstallScreen.cs

@@ -88,7 +88,7 @@ public override void Run(ConsoleTheme theme, Action<ConsoleTheme> process = null
                         }
                         if (plan.Upgrade.Count > 0) {
                             var upgGroups = registry
-                                            .CheckUpgradeable(manager.CurrentInstance.VersionCriteria(),
+                                            .CheckUpgradeable(manager.CurrentInstance,
                                                               // Hold identifiers not chosen for upgrading
                                                               registry.Installed(false)
                                                                       .Keys

ConsoleUI/ModInfoScreen.cs

@@ -267,7 +267,7 @@ private int addDependencies(int top = 8)
                 int nameW = midL - 2 - lblW - 2 - 1;
                 int depsH = (h - 2) * numDeps / (numDeps + numConfs);
                 var upgradeableGroups = registry
-                                        .CheckUpgradeable(manager.CurrentInstance.VersionCriteria(),
+                                        .CheckUpgradeable(manager.CurrentInstance,
                                                           new HashSet<string>());
 
                 AddObject(new ConsoleFrame(

ConsoleUI/ModListScreen.cs

@@ -607,7 +607,7 @@ private List<CkanModule> GetAllMods(ConsoleTheme theme, bool force = false)
                     }
                 }
                 upgradeableGroups = registry
-                                    .CheckUpgradeable(crit, new HashSet<string>());
+                                    .CheckUpgradeable(manager.CurrentInstance, new HashSet<string>());
             }
             return allMods;
         }

Core/Registry/IRegistryQuerier.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Linq;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -172,7 +173,7 @@ public static bool IsAutodetected(this IRegistryQuerier querier, string identifi
         /// </summary>
         public static bool HasUpdate(this IRegistryQuerier   querier,
                                      string                  identifier,
-                                     GameVersionCriteria     versionCrit,
+                                     GameInstance            instance,
                                      out CkanModule          latestMod,
                                      ICollection<CkanModule> installed = null)
         {
@@ -186,7 +187,7 @@ public static bool HasUpdate(this IRegistryQuerier   querier,
             // Check if it's available
             try
             {
-                latestMod = querier.LatestAvailable(identifier, versionCrit, null, installed);
+                latestMod = querier.LatestAvailable(identifier, instance.VersionCriteria(), null, installed);
             }
             catch
             {
@@ -199,7 +200,15 @@ public static bool HasUpdate(this IRegistryQuerier   querier,
             // Check if the installed module is up to date
             var comp = latestMod.version.CompareTo(instVer);
             if (comp == -1
-                || (comp == 0 && !querier.MetadataChanged(identifier)))
+                || (comp == 0 && !querier.MetadataChanged(identifier)
+                              // Check if any of the files or directories are missing
+                              && (instance == null
+                                  || (querier.InstalledModule(identifier)
+                                             ?.Files
+                                              .Select(instance.ToAbsoluteGameDir)
+                                              .All(p => Directory.Exists(p) || File.Exists(p))
+                                             // Manually installed, consider up to date
+                                             ?? true))))
             {
                 latestMod = null;
                 return false;
@@ -212,26 +221,26 @@ public static bool HasUpdate(this IRegistryQuerier   querier,
         }
 
         public static Dictionary<bool, List<CkanModule>> CheckUpgradeable(this IRegistryQuerier querier,
-                                                                          GameVersionCriteria   versionCrit,
+                                                                          GameInstance          instance,
                                                                           HashSet<string>       heldIdents)
         {
             // Get the absolute latest versions ignoring restrictions,
             // to break out of mutual version-depending deadlocks
             var unlimited = querier.Installed(false)
                                    .Keys
                                    .Select(ident => !heldIdents.Contains(ident)
-                                                    && querier.HasUpdate(ident, versionCrit,
+                                                    && querier.HasUpdate(ident, instance,
                                                                          out CkanModule latest)
                                                     && !latest.IsDLC
                                                         ? latest
                                                         : querier.GetInstalledVersion(ident))
                                    .Where(m => m != null)
                                    .ToList();
-            return querier.CheckUpgradeable(versionCrit, heldIdents, unlimited);
+            return querier.CheckUpgradeable(instance, heldIdents, unlimited);
         }
 
         public static Dictionary<bool, List<CkanModule>> CheckUpgradeable(this IRegistryQuerier querier,
-                                                                          GameVersionCriteria   versionCrit,
+                                                                          GameInstance          instance,
                                                                           HashSet<string>       heldIdents,
                                                                           List<CkanModule>      initial)
         {
@@ -241,7 +250,7 @@ public static Dictionary<bool, List<CkanModule>> CheckUpgradeable(this IRegistry
             foreach (var ident in initial.Select(module => module.identifier))
             {
                 if (!heldIdents.Contains(ident)
-                    && querier.HasUpdate(ident, versionCrit,
+                    && querier.HasUpdate(ident, instance,
                                          out CkanModule latest, initial)
                     && !latest.IsDLC)
                 {

Core/Registry/InstalledModule.cs

@@ -2,7 +2,6 @@
 using System.ComponentModel;
 using System.Collections.Generic;
 using System.IO;
-using System.Security.Cryptography;
 using System.Runtime.Serialization;
 
 using Newtonsoft.Json;
@@ -12,51 +11,9 @@ namespace CKAN
     [JsonObject(MemberSerialization.OptIn)]
     public class InstalledModuleFile
     {
-
-        // TODO: This class should also record file paths as well.
-        // It's just sha1 now for registry compatibility.
-
-        [JsonProperty("sha1_sum", NullValueHandling = NullValueHandling.Ignore)]
-        private readonly string sha1_sum;
-
-        public string Sha1 => sha1_sum;
-
-        public InstalledModuleFile(string path, GameInstance ksp)
-        {
-            string absolute_path = ksp.ToAbsoluteGameDir(path);
-            // TODO: What is the net performance cost of calculating this? Big files are not quick to hash!
-            sha1_sum = Sha1Sum(absolute_path);
-        }
-
-        // We need this because otherwise JSON.net tries to pass in
-        // our sha1's as paths, and things go wrong.
         [JsonConstructor]
-        private InstalledModuleFile()
-        {
-        }
-
-        /// <summary>
-        /// Returns the sha1 sum of the given filename.
-        /// Returns null if passed a directory.
-        /// Throws an exception on failure to access the file.
-        /// </summary>
-        private static string Sha1Sum(string path)
+        public InstalledModuleFile()
         {
-            if (Directory.Exists(path))
-            {
-                return null;
-            }
-
-            SHA1 hasher = SHA1.Create();
-
-            // Even if we throw an exception, the using block here makes sure
-            // we close our file.
-            using (var fh = File.OpenRead(path))
-            {
-                string sha1 = BitConverter.ToString(hasher.ComputeHash(fh));
-                fh.Close();
-                return sha1;
-            }
         }
     }
 
@@ -127,7 +84,7 @@ public InstalledModule(GameInstance ksp, CkanModule module, IEnumerable<string>
                     }
 
                     // IMF needs a KSP object so it can compute the SHA1.
-                    installed_files[file] = new InstalledModuleFile(file, ksp);
+                    installed_files[file] = new InstalledModuleFile();
                 }
             }
         }

GUI/Controls/Changeset.cs

@@ -40,7 +40,6 @@ public void LoadChangeset(List<ModChange>                changes,
                 changes?.Select(ch => new ChangesetRow(ch, AlertLabels, conflicts))
                         .ToList()
                        ?? new List<ChangesetRow>());
-            ChangesGrid.AutoResizeColumns();
         }
 
         public CkanModule SelectedItem => SelectedRow?.Change.Mod;
@@ -70,6 +69,7 @@ private void ChangesGrid_DataBindingComplete(object sender, DataGridViewBindingC
                     }
                 }
             }
+            ChangesGrid.AutoResizeColumns();
         }
 
         private void ChangesGrid_CellClick(object sender, DataGridViewCellEventArgs e)
@@ -101,8 +101,13 @@ private void BackButton_Click(object sender, EventArgs e)
 
         private void ChangesGrid_SelectionChanged(object sender, EventArgs e)
         {
+            if (ChangesGrid.SelectedRows.Count > 0 && !Visible)
+            {
+                // Suppress selection while inactive
+                ChangesGrid.ClearSelection();
+            }
             // Don't pop up mod info when they click the X icons
-            if (ChangesGrid.CurrentCell?.OwningColumn is DataGridViewTextBoxColumn)
+            else if (ChangesGrid.CurrentCell?.OwningColumn is DataGridViewTextBoxColumn)
             {
                 OnSelectedItemsChanged?.Invoke(SelectedRow?.Change.Mod);
             }