Merge #3637 Update mod list through Wait.StartWaiting

CHANGELOG.md

@@ -13,7 +13,7 @@ All notable changes to this project will be documented in this file.
 - [CLI] Create a system menu entry for command prompt (#3622 by: HebaruSan; reviewed: techman83)
 - [Multiple] Internationalize Core, CmdLine, ConsoleUI, and AutoUpdater (#3482 by: HebaruSan; reviewed: techman83)
 - [Multiple] Check free space before downloading (#3631 by: HebaruSan; reviewed: techman83)
-- [Multiple] Many improvements for failed downloads (#3635 by: HebaruSan; reviewed: techman83)
+- [Multiple] Many improvements for failed downloads (#3635, #3637 by: HebaruSan; reviewed: techman83)
 
 ## Bugfixes
 

GUI/Controls/ManageMods.cs

@@ -5,7 +5,10 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using System.ComponentModel;
+
 using log4net;
+
 using CKAN.Versioning;
 
 namespace CKAN.GUI
@@ -83,8 +86,7 @@ private List<bool> descending
         public event Action OnRegistryChanged;
 
         public event Action<List<ModChange>> StartChangeSet;
-        public event Action OpenProgressTab;
-        public event Action CloseProgressTab;
+        public event Action<Dictionary<string, bool>> OnRefresh;
         public event Action<IEnumerable<GUIMod>> LabelsAfterUpdate;
 
         private IEnumerable<ModChange> ChangeSet
@@ -1066,26 +1068,15 @@ private void _UpdateFilters()
             }
         }
 
-        public async void UpdateModsList(Dictionary<string, bool> old_modules = null)
+        public void Update(object sender, DoWorkEventArgs e)
         {
-            // Run the update in the background so the UI thread can appear alive
-            // Await it so potential (fatal) errors are thrown, not swallowed.
-            // Need to be on the GUI thread to get the translated strings
-            Main.Instance.tabController.RenameTab("WaitTabPage", Properties.Resources.MainModListWaitTitle);
-            await Task.Factory.StartNew(() =>
-                _UpdateModsList(old_modules)
-            );
+            _UpdateModsList(e.Argument as Dictionary<string, bool>);
         }
 
         private void _UpdateModsList(Dictionary<string, bool> old_modules = null)
         {
             log.Info("Updating the mod list");
 
-            if (OpenProgressTab != null)
-            {
-                OpenProgressTab();
-            }
-
             Main.Instance.Wait.AddLogMessage(Properties.Resources.MainModListLoadingRegistry);
             GameVersionCriteria versionCriteria = Main.Instance.CurrentInstance.VersionCriteria();
             IRegistryQuerier registry = RegistryManager.Instance(Main.Instance.CurrentInstance).registry;
@@ -1205,10 +1196,6 @@ private void _UpdateModsList(Dictionary<string, bool> old_modules = null)
 
             Main.Instance.Wait.AddLogMessage(Properties.Resources.MainModListUpdatingTray);
 
-            if (CloseProgressTab != null)
-            {
-                CloseProgressTab();
-            }
             Util.Invoke(this, () => ModGrid.Focus());
         }
 

GUI/Main/Main.cs

@@ -291,7 +291,7 @@ private void CurrentInstanceUpdated(bool allowRepoUpdate)
                 else
                 {
                     SetupDefaultSearch();
-                    ManageMods.UpdateModsList();
+                    ManageMods_OnRefresh();
                 }
             }
             ManageMods.InstanceUpdated(CurrentInstance);
@@ -607,7 +607,7 @@ private void CompatibleGameVersionsToolStripMenuItem_Click(object sender, EventA
             if (dialog.ShowDialog() != DialogResult.Cancel)
             {
                 // This takes a while, so don't do it if they cancel out
-                ManageMods.UpdateModsList();
+                ManageMods_OnRefresh();
             }
         }
 
@@ -811,20 +811,22 @@ private void ManageMods_StartChangeSet(List<ModChange> changeset)
                     changeset, RelationshipResolver.DependsOnlyOpts()));
         }
 
-        private void ManageMods_OpenProgressTab()
+        private void ManageMods_OnRefresh(Dictionary<string, bool> oldModules = null)
         {
-            ResetProgress();
+            tabController.RenameTab("WaitTabPage", Properties.Resources.MainModListWaitTitle);
             ShowWaitDialog();
-            tabController.SetTabLock(true);
-            Util.Invoke(this, SwitchEnabledState);
-        }
-
-        private void ManageMods_CloseProgressTab()
-        {
-            Util.Invoke(this, UpdateTrayInfo);
-            HideWaitDialog(true);
-            tabController.SetTabLock(false);
             Util.Invoke(this, SwitchEnabledState);
+            tabController.SetTabLock(true);
+            Wait.StartWaiting(
+                ManageMods.Update,
+                (sender, e) => {
+                    HideWaitDialog(true);
+                    tabController.SetTabLock(false);
+                    Util.Invoke(this, SwitchEnabledState);
+                    SetupDefaultSearch();
+                },
+                false,
+                oldModules);
         }
     }
 }

GUI/Main/MainDownload.cs

@@ -82,8 +82,7 @@ private void _PostModCaching(GUIMod module)
         {
             module.UpdateIsCached();
             // Update mod list in case is:cached or not:cached filters are active
-            ManageMods.UpdateModsList();
-            HideWaitDialog(true);
+            ManageMods_OnRefresh();
             // User might have selected another row. Show current in tree.
             UpdateModContentsTree(ModInfo.SelectedModule.ToCkanModule(), true);
         }

GUI/Main/MainInstall.cs

@@ -413,7 +413,7 @@ private void PostInstallMods(object sender, RunWorkerCompletedEventArgs e)
                 // The Result property throws if InstallMods threw (!!!)
                 KeyValuePair<bool, ModChanges> result = (KeyValuePair<bool, ModChanges>) e.Result;
                 // Rebuilds the list of GUIMods
-                ManageMods.UpdateModsList();
+                ManageMods_OnRefresh();
 
                 Util.Invoke(this, () => Enabled = true);
                 Util.Invoke(menuStrip1, () => menuStrip1.Enabled = true);

GUI/Main/MainRepo.cs

@@ -140,30 +140,34 @@ private void PostUpdateRepo(object sender, RunWorkerCompletedEventArgs e)
                     // Load rows if grid empty, otherwise keep current
                     if (ManageMods.ModGrid.Rows.Count < 1)
                     {
-                        ManageMods.UpdateModsList();
+                        ManageMods_OnRefresh();
                     }
+                    else
+                    {
+                        Util.Invoke(this, SwitchEnabledState);
+                        Util.Invoke(this, ManageMods.ModGrid.Select);
+                    }
+                    SetupDefaultSearch();
                     break;
 
                 case RepoUpdateResult.Failed:
                     AddStatusMessage(Properties.Resources.MainRepoFailed);
                     HideWaitDialog(false);
+                    Util.Invoke(this, SwitchEnabledState);
+                    Util.Invoke(this, ManageMods.ModGrid.Select);
+                    SetupDefaultSearch();
                     break;
 
                 case RepoUpdateResult.Updated:
                 default:
-                    ManageMods.UpdateModsList(oldModules);
                     AddStatusMessage(Properties.Resources.MainRepoSuccess);
                     ShowRefreshQuestion();
-                    HideWaitDialog(true);
                     UpgradeNotification();
+                    Util.Invoke(this, SwitchEnabledState);
+                    ManageMods_OnRefresh(oldModules);
                     break;
             }
 
-            tabController.HideTab("WaitTabPage");
-            Util.Invoke(this, SwitchEnabledState);
-            Util.Invoke(this, RecreateDialogs);
-            Util.Invoke(this, ManageMods.ModGrid.Select);
-            SetupDefaultSearch();
         }
 
         private void ShowRefreshQuestion()