Merge #3307 Fixes for GUI and .ckan-installed modules

CHANGELOG.md

@@ -26,6 +26,7 @@ All notable changes to this project will be documented in this file.
 - [GUI] Fix checkbox sorting (#3297 by: HebaruSan; reviewed: DasSkelett)
 - [GUI] Handle incompatible force-installed dependencies of recommendations (#3305 by: HebaruSan; reviewed: DasSkelett)
 - [Multiple] Don't warn about incompatible DLCs, fix conflict highlighting with DLC installed (#3304 by: HebaruSan; reviewed: DasSkelett)
+- [Multiple] Fixes for GUI and .ckan-installed modules (#3307 by: DasSkelett; reviewed: HebaruSan)
 
 ### Internal
 

ConsoleUI/ConsoleCKAN.cs

@@ -16,7 +16,7 @@ public class ConsoleCKAN {
         /// </summary>
         public ConsoleCKAN(GameInstanceManager mgr, string themeName, bool debug)
         {
-            if (ConsoleTheme.Themes.TryGetValue(themeName, out ConsoleTheme theme))
+            if (ConsoleTheme.Themes.TryGetValue(themeName ?? "default", out ConsoleTheme theme))
             {
                 // GameInstanceManager only uses its IUser object to construct game instance objects,
                 // which only use it to inform the user about the creation of the CKAN/ folder.
@@ -40,7 +40,7 @@ public ConsoleCKAN(GameInstanceManager mgr, string themeName, bool debug)
                         }
                     }
                     if (manager.CurrentInstance != null) {
-                        new ModListScreen(manager, debug).Run(theme);
+                        new ModListScreen(manager, debug, theme).Run(theme);
                     }
 
                     new ExitScreen().Run(theme);

ConsoleUI/ModListScreen.cs

@@ -17,15 +17,15 @@ public class ModListScreen : ConsoleScreen {
         /// </summary>
         /// <param name="mgr">Game instance manager object containing the current instance</param>
         /// <param name="dbg">True if debug options should be available, false otherwise</param>
-        public ModListScreen(GameInstanceManager mgr, bool dbg)
+        public ModListScreen(GameInstanceManager mgr, bool dbg, ConsoleTheme _theme)
         {
             debug    = dbg;
             manager  = mgr;
             registry = RegistryManager.Instance(manager.CurrentInstance).registry;
 
             moduleList = new ConsoleListBox<CkanModule>(
                 1, 4, -1, -2,
-                GetAllMods(),
+                GetAllMods(_theme),
                 new List<ConsoleListBoxColumn<CkanModule>>() {
                     new ConsoleListBoxColumn<CkanModule>() {
                         Header   = "",
@@ -205,7 +205,7 @@ public ModListScreen(GameInstanceManager mgr, bool dbg)
                 }
                 return true;
             });
-            
+
             moduleList.AddTip("F8", "Mark auto-installed",
                 () => moduleList.Selection != null && !moduleList.Selection.IsDLC
                     && (!registry.InstalledModule(moduleList.Selection.identifier)?.AutoInstalled ?? false)
@@ -265,7 +265,7 @@ public ModListScreen(GameInstanceManager mgr, bool dbg)
                 null,
                 new ConsoleMenuOption("Refresh mod list", "F5, Ctrl+R",
                     "Refresh the list of mods",
-                    true, UpdateRegistry),
+                    true, (ConsoleTheme th) => UpdateRegistry(th)),
                 new ConsoleMenuOption("Upgrade all",          "Ctrl+U",
                     "Mark all available updates for installation",
                     true, UpgradeAll, null, null, HasAnyUpgradeable()),
@@ -328,7 +328,7 @@ protected override string CenterHeader()
         private bool ImportDownloads(ConsoleTheme theme)
         {
             DownloadImportDialog.ImportDownloads(theme, manager.CurrentInstance, manager.Cache, plan);
-            RefreshList();
+            RefreshList(theme);
             return true;
         }
 
@@ -393,7 +393,7 @@ private bool ViewSuggestions(ConsoleTheme theme)
                         }
                     }
                     if (needRefresh) {
-                        RefreshList();
+                        RefreshList(theme);
                     }
                 } else {
                     RaiseError("Installed mods have no unsatisfied recommendations or suggestions.");
@@ -414,7 +414,7 @@ private int daysSinceUpdated(string filename)
             return (DateTime.Now - File.GetLastWriteTime(filename)).Days;
         }
 
-        private bool UpdateRegistry(ConsoleTheme theme)
+        private bool UpdateRegistry(ConsoleTheme theme, bool showNewModsPrompt = true)
         {
             ProgressScreen ps = new ProgressScreen("Updating Registry", "Checking for updates");
             LaunchSubScreen(theme, ps, (ConsoleTheme th) => {
@@ -447,11 +447,11 @@ private bool UpdateRegistry(ConsoleTheme theme)
                     }
                 }
             });
-            if (recent.Count > 0 && RaiseYesNoDialog(newModPrompt(recent.Count))) {
+            if (showNewModsPrompt && recent.Count > 0 && RaiseYesNoDialog(newModPrompt(recent.Count))) {
                 searchBox.Clear();
                 moduleList.FilterString = searchBox.Value = "~n";
             }
-            RefreshList();
+            RefreshList(theme);
             return true;
         }
 
@@ -481,7 +481,7 @@ private bool SelectInstall(ConsoleTheme theme)
             if (!prevInst.Equals(manager.CurrentInstance)) {
                 plan.Reset();
                 registry = RegistryManager.Instance(manager.CurrentInstance).registry;
-                RefreshList();
+                RefreshList(theme);
             }
             return true;
         }
@@ -492,17 +492,23 @@ private bool EditAuthTokens(ConsoleTheme theme)
             return true;
         }
 
-        private void RefreshList()
+        private void RefreshList(ConsoleTheme theme)
         {
-            moduleList.SetData(GetAllMods(true));
+            // In the constructor this is called while moduleList is being populated, just do nothing in this case.
+            // ModListScreen -> moduleList = (GetAllMods ...) -> UpdateRegistry -> RefreshList
+            moduleList?.SetData(GetAllMods(theme,true));
         }
 
         private List<CkanModule> allMods = null;
 
-        private List<CkanModule> GetAllMods(bool force = false)
+        private List<CkanModule> GetAllMods(ConsoleTheme theme, bool force = false)
         {
             ScanForMods();
             if (allMods == null || force) {
+                if (!registry?.HasAnyAvailable() ?? false)
+                {
+                    UpdateRegistry(theme, false);
+                }
                 allMods = new List<CkanModule>(registry.CompatibleModules(manager.CurrentInstance.VersionCriteria()));
                 foreach (InstalledModule im in registry.InstalledModules) {
                     CkanModule m = null;
@@ -546,7 +552,7 @@ private bool Help(ConsoleTheme theme)
         private bool ApplyChanges(ConsoleTheme theme)
         {
             LaunchSubScreen(theme, new InstallScreen(manager, plan, debug));
-            RefreshList();
+            RefreshList(theme);
             return true;
         }
 
@@ -598,9 +604,9 @@ private long totalInstalledDownloadSize()
             return total;
         }
 
-        private GameInstanceManager       manager;
-        private IRegistryQuerier registry;
-        private bool             debug;
+        private GameInstanceManager manager;
+        private Registry            registry;
+        private bool                debug;
 
         private ConsoleField               searchBox;
         private ConsoleListBox<CkanModule> moduleList;
@@ -839,7 +845,7 @@ public enum InstallStatus {
         /// This mod is installed and not upgradeable or planned to be removed
         /// </summary>
         Installed,
-        
+
         /// <summary>
         /// Like Installed, but can be auto-removed if depending mods are removed
         /// </summary>

Core/ModuleInstaller.cs

@@ -1347,7 +1347,7 @@ IRegistryQuerier            registry
             {
                 RelationshipResolver resolver = new RelationshipResolver(
                     toInstall,
-                    null,
+                    toInstall.Select(m => registry.InstalledModule(m.identifier)?.Module).Where(m => m != null),
                     opts, registry, ksp.VersionCriteria()
                 );
 

Core/Net/NetAsyncDownloader.cs

@@ -356,6 +356,8 @@ private void FileProgressReport(int index, int percent, long bytesDownloaded, lo
 
             foreach (NetAsyncDownloaderDownloadPart t in downloads.ToList())
             {
+                if (t == null)
+                    continue;
                 if (t.bytesLeft > 0)
                 {
                     totalBytesPerSecond += t.bytesPerSecond;
@@ -366,6 +368,9 @@ private void FileProgressReport(int index, int percent, long bytesDownloaded, lo
             }
             foreach (Net.DownloadTarget t in queuedDownloads.ToList())
             {
+                // Somehow managed to get a NullRef for t here
+                if (t == null)
+                    continue;
                 totalBytesLeft += t.size;
                 totalSize += t.size;
             }

Core/Registry/IRegistryQuerier.cs

@@ -194,7 +194,7 @@ public static bool HasUpdate(this IRegistryQuerier querier, string identifier, G
             {
                 RelationshipResolver resolver = new RelationshipResolver(
                     new CkanModule[] { newest_version },
-                    null,
+                    new CkanModule[] { querier.InstalledModule(identifier).Module },
                     new RelationshipResolverOptions()
                     {
                         with_recommends = false,

Core/Relationships/RelationshipResolver.cs

@@ -247,9 +247,9 @@ private void AddModulesToInstall(IEnumerable<CkanModule> modules)
             {
                 log.DebugFormat("Preparing to resolve relationships for {0} {1}", module.identifier, module.version);
 
-                //Need to check against installed mods and those to install.
-                var mods = modlist.Values.Concat(installed_modules).Where(listed_mod => listed_mod.ConflictsWith(module));
-                foreach (CkanModule listed_mod in mods)
+                // Need to check against installed mods and those to install.
+                var conflictingModules = modlist.Values.Concat(installed_modules).Where(listed_mod => listed_mod.ConflictsWith(module));
+                foreach (CkanModule listed_mod in conflictingModules)
                 {
                     if (options.proceed_with_inconsistencies)
                     {

GUI/Controls/AllModVersions.cs

@@ -122,6 +122,11 @@ public GUIMod SelectedModule
                         visibleGuiModule.PropertyChanged += visibleGuiModule_PropertyChanged;
                     }
                 }
+                VersionsListView.Items.Clear();
+                if (value == null)
+                {
+                    return;
+                }
 
                 // Get all the data; can put this in bg if slow
                 GameInstance currentInstance = Main.Instance.Manager.CurrentInstance;
@@ -139,16 +144,28 @@ public GUIMod SelectedModule
                 }
                 catch (ModuleNotFoundKraken)
                 {
-                    // No versions to be shown, abort and hope an auto refresh happens
+                    // Identifier unknown to registry, maybe installed from local .ckan
+                    allAvailableVersions = new Dictionary<CkanModule, bool>();
+                }
+
+                // Take the module associated with GUIMod, if any, and append it to the list if it's not already there.
+                var installedModule = value.InstalledMod?.Module;
+                if (installedModule != null && !allAvailableVersions.ContainsKey(installedModule))
+                {
+                    allAvailableVersions.Add(installedModule, installable(installer, installedModule, registry));
+                }
+
+                if (!allAvailableVersions.Any())
+                {
                     return;
                 }
+
                 ModuleVersion installedVersion = registry.InstalledVersion(value.Identifier);
 
                 // Update UI; must be in fg
                 ignoreItemCheck = true;
                 bool latestCompatibleVersionAlreadyFound = false;
 
-                VersionsListView.Items.Clear();
                 // Only show checkboxes for non-DLC modules
                 VersionsListView.CheckBoxes = !value.ToModule().IsDLC;
 

GUI/Controls/ManageMods.cs

@@ -786,8 +786,21 @@ public void ClearChangeSet()
                 {
                     mod.SetInstallChecked(row, Installed, mod.IsInstalled);
                 }
+                else if (mod.SelectedMod != mod.InstalledMod?.Module)
+                {
+                    mod.SelectedMod = mod.InstalledMod?.Module;
+                }
                 mod.SetUpgradeChecked(row, UpdateCol, false);
                 mod.SetReplaceChecked(row, ReplaceCol, false);
+                // Marking a mod as AutoInstalled can immediately queue it for removal if there is no dependent mod.
+                // Reset the state of the AutoInstalled checkbox for these by deducing it from the changeset.
+                if (mod.InstalledMod != null &&
+                    ChangeSet.Contains(new ModChange(mod.InstalledMod?.Module, GUIModChangeType.Remove,
+                        new SelectionReason.NoLongerUsed()))
+                )
+                {
+                    mod.SetAutoInstallChecked(row, AutoInstalled, false);
+                }
             }
         }
 

GUI/Controls/ModInfo.cs

@@ -140,7 +140,7 @@ private void UpdateModInfo(GUIMod gui_module)
             Util.Invoke(MetadataModuleAuthorTextBox, () => MetadataModuleAuthorTextBox.Text = gui_module.Authors);
             Util.Invoke(MetadataIdentifierTextBox, () => MetadataIdentifierTextBox.Text = module.identifier);
 
-            Util.Invoke(MetadataModuleReleaseStatusTextBox, () => 
+            Util.Invoke(MetadataModuleReleaseStatusTextBox, () =>
             {
                 if (module.release_status == null)
                 {