Merge #3305 Handle incompatible force-installed dependencies of recom…

…mendations
KSP-CKAN · Feb 24, 2021 · d3624b9 · d3624b9
2 parents b748670 + 2c6decd
commit d3624b9
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file.
 - [Multiple] Modpack usability fixes (#3243 by: HebaruSan; reviewed: DasSkelett)
 - [Multiple] Fix crashes in audit recommendations (#3292 by: HebaruSan; reviewed: DasSkelett)
 - [GUI] Fix checkbox sorting (#3297 by: HebaruSan; reviewed: DasSkelett)
+- [GUI] Handle incompatible force-installed dependencies of recommendations (#3305 by: HebaruSan; reviewed: DasSkelett)
 
 ### Internal
 

diff --git a/GUI/Controls/ChooseRecommendedMods.cs b/GUI/Controls/ChooseRecommendedMods.cs
@@ -17,13 +17,17 @@ public ChooseRecommendedMods()
         }
 
         public void LoadRecommendations(
-            IRegistryQuerier registry, GameVersionCriteria GameVersion, NetModuleCache cache,
+            IRegistryQuerier registry,
+            HashSet<CkanModule> toInstall, HashSet<CkanModule> toUninstall,
+            GameVersionCriteria GameVersion, NetModuleCache cache,
             Dictionary<CkanModule, Tuple<bool, List<string>>> recommendations,
             Dictionary<CkanModule, List<string>> suggestions,
             Dictionary<CkanModule, HashSet<string>> supporters
         )
         {
             this.registry    = registry;
+            this.toInstall   = toInstall;
+            this.toUninstall = toUninstall;
             this.GameVersion = GameVersion;
             Util.Invoke(this, () =>
             {
@@ -83,22 +87,36 @@ private void RecommendedModsListView_ItemChecked(object sender, ItemCheckedEvent
 
         private void MarkConflicts()
         {
-            var conflicts = FindConflicts();
-            foreach (var item in RecommendedModsListView.Items.Cast<ListViewItem>()
-                // Apparently ListView handes AddRange by:
-                //   1. Expanding the Items list to the new size by filling it with nulls
-                //   2. One by one, replace each null with a real item and call _ItemChecked
-                // ... so the Items list can contain null!!
-                .Where(it => it != null))
+            try
             {
-                item.BackColor = conflicts.ContainsKey(item.Tag as CkanModule)
-                    ? Color.LightCoral
-                    : Color.Empty;
+                var conflicts = FindConflicts();
+                foreach (var item in RecommendedModsListView.Items.Cast<ListViewItem>()
+                    // Apparently ListView handes AddRange by:
+                    //   1. Expanding the Items list to the new size by filling it with nulls
+                    //   2. One by one, replace each null with a real item and call _ItemChecked
+                    // ... so the Items list can contain null!!
+                    .Where(it => it != null))
+                {
+                    item.BackColor = conflicts.ContainsKey(item.Tag as CkanModule)
+                        ? Color.LightCoral
+                        : Color.Empty;
+                }
+                RecommendedModsContinueButton.Enabled = !conflicts.Any();
+                if (OnConflictFound != null)
+                {
+                    OnConflictFound(conflicts.Any() ? conflicts.First().Value : "");
+                }
             }
-            RecommendedModsContinueButton.Enabled = !conflicts.Any();
-            if (OnConflictFound != null)
+            catch (DependencyNotSatisfiedKraken k)
             {
-                OnConflictFound(conflicts.Any() ? conflicts.First().Value : "");
+                var row = RecommendedModsListView.Items.Cast<ListViewItem>()
+                    .FirstOrDefault(it => (it?.Tag as CkanModule) == k.parent);
+                if (row != null)
+                {
+                    row.BackColor = Color.LightCoral;
+                }
+                RecommendedModsContinueButton.Enabled = false;
+                OnConflictFound?.Invoke(k.Message);
             }
         }
 
@@ -115,8 +133,9 @@ private Dictionary<CkanModule, String> FindConflicts()
             return new RelationshipResolver(
                 RecommendedModsListView.CheckedItems.Cast<ListViewItem>()
                     .Select(item => item.Tag as CkanModule)
+                    .Concat(toInstall)
                     .Distinct(),
-                new CkanModule[] { },
+                toUninstall,
                 conflictOptions, registry, GameVersion
             ).ConflictList;
         }
@@ -197,6 +216,8 @@ private void RecommendedModsContinueButton_Click(object sender, EventArgs e)
         }
 
         private IRegistryQuerier    registry;
+        private HashSet<CkanModule> toInstall;
+        private HashSet<CkanModule> toUninstall;
         private GameVersionCriteria GameVersion;
 
         private TaskCompletionSource<HashSet<CkanModule>> task;

diff --git a/GUI/Main/MainInstall.cs b/GUI/Main/MainInstall.cs
@@ -79,7 +79,7 @@ private void InstallMods(object sender, DoWorkEventArgs e)
 
             // this will be the final list of mods we want to install
             HashSet<CkanModule> toInstall = new HashSet<CkanModule>();
-            var toUninstall = new HashSet<string>();
+            var toUninstall = new HashSet<CkanModule>();
             var toUpgrade   = new HashSet<CkanModule>();
 
             // First compose sets of what the user wants installed, upgraded, and removed.
@@ -88,7 +88,7 @@ private void InstallMods(object sender, DoWorkEventArgs e)
                 switch (change.ChangeType)
                 {
                     case GUIModChangeType.Remove:
-                        toUninstall.Add(change.Mod.identifier);
+                        toUninstall.Add(change.Mod);
                         break;
                     case GUIModChangeType.Update:
                         toUpgrade.Add(change is ModUpgrade mu
@@ -102,7 +102,7 @@ private void InstallMods(object sender, DoWorkEventArgs e)
                         ModuleReplacement repl = registry.GetReplacement(change.Mod, CurrentInstance.VersionCriteria());
                         if (repl != null)
                         {
-                            toUninstall.Add(repl.ToReplace.identifier);
+                            toUninstall.Add(repl.ToReplace);
                             toInstall.Add(repl.ReplaceWith);
                         }
                         break;
@@ -123,8 +123,9 @@ out Dictionary<CkanModule, HashSet<string>> supporters
             {
                 tabController.ShowTab("ChooseRecommendedModsTabPage", 3);
                 ChooseRecommendedMods.LoadRecommendations(
-                    registry, CurrentInstance.VersionCriteria(),
-                    Manager.Cache, recommendations, suggestions, supporters);
+                    registry, toInstall, toUninstall,
+                    CurrentInstance.VersionCriteria(), Manager.Cache,
+                    recommendations, suggestions, supporters);
                 tabController.SetTabLock(true);
                 var result = ChooseRecommendedMods.Wait();
                 if (result == null)
@@ -181,7 +182,8 @@ out Dictionary<CkanModule, HashSet<string>> supporters
                         processSuccessful = false;
                         if (!installCanceled)
                         {
-                            installer.UninstallList(toUninstall, ref possibleConfigOnlyDirs, registry_manager, false, toInstall);
+                            installer.UninstallList(toUninstall.Select(m => m.identifier),
+                                ref possibleConfigOnlyDirs, registry_manager, false, toInstall);
                             processSuccessful = true;
                         }
                     }

diff --git a/GUI/Main/MainRecommendations.cs b/GUI/Main/MainRecommendations.cs
@@ -45,8 +45,9 @@ out Dictionary<CkanModule, HashSet<string>> supporters
             {
                 tabController.ShowTab("ChooseRecommendedModsTabPage", 3);
                 ChooseRecommendedMods.LoadRecommendations(
-                    registry, versionCriteria,
-                    Manager.Cache, recommendations, suggestions, supporters);
+                    registry, new HashSet<CkanModule>(), new HashSet<CkanModule>(),
+                    versionCriteria, Manager.Cache,
+                    recommendations, suggestions, supporters);
                 var result = ChooseRecommendedMods.Wait();
                 tabController.HideTab("ChooseRecommendedModsTabPage");
                 if (result != null && result.Any())