Installed games will now be restored on adding/removing a root directory or on pressing F5 at the Library

Author: Yelo420

gamevault/App.xaml.cs

@@ -178,6 +178,7 @@ public void SetJumpListGames()
         {
             try
             {
+                jumpList.JumpItems.RemoveRange(5, jumpList.JumpItems.Count - 5);// Remove all previous games. Now we add the current game list
                 var lastGames = InstallViewModel.Instance.InstalledGames.Take(5).ToArray();
                 foreach (var game in lastGames)
                 {

gamevault/UserControls/InstallUserControl.xaml.cs

@@ -42,11 +42,14 @@ private async void UserControl_Loaded(object sender, RoutedEventArgs e)
         }
         public async Task RestoreInstalledGames()
         {
+            if (gamesRestored)
+            {
+                InstallViewModel.Instance.InstalledGames.Clear();// Clear here because the double entry code won't allow to refresh
+                //File watchers are already protected against double entries and dont care, if the same code runs again
+            }
             Dictionary<int, string> foundGames = new Dictionary<int, string>();
             Game[]? games = await Task<Game[]>.Run(async () =>
             {
-               
-                //string installationPath = Path.Combine(SettingsViewModel.Instance.RootPath, "GameVault\\Installations");
                 if (SettingsViewModel.Instance.RootDirectories.Count > 0)
                 {
 
@@ -156,6 +159,10 @@ public async Task RestoreInstalledGames()
                 }
                 InstallViewModel.Instance.InstalledGames = await SortInstalledGamesByLastPlayed(TempInstalledGames);
                 InstallViewModel.Instance.InstalledGamesFilter = CollectionViewSource.GetDefaultView(InstallViewModel.Instance.InstalledGames);
+                if (gamesRestored)
+                {
+                    SearchFilterInputTimerElapsed(null, null);//Keep the filter
+                }
             }
             gamesRestored = true;
             App.Instance.SetJumpListGames();
@@ -288,13 +295,13 @@ private void Search_TextChanged(object sender, TextChangedEventArgs e)
             inputTimer.Data = ((TextBox)sender).Text;
             inputTimer.Start();
         }
-        private void InputTimerElapsed(object sender, EventArgs e)
+        private void SearchFilterInputTimerElapsed(object sender, EventArgs e)
         {
             inputTimer.Stop();
             if (InstallViewModel.Instance.InstalledGamesFilter == null) return;
             InstallViewModel.Instance.InstalledGamesFilter.Filter = item =>
             {
-                return ((KeyValuePair<Game, string>)item).Key.Title.Contains(inputTimer.Data, StringComparison.OrdinalIgnoreCase);
+                return ((KeyValuePair<Game, string>)item).Key.Title.Contains(inputTimer.Data ?? "", StringComparison.OrdinalIgnoreCase);
             };
         }
 
@@ -384,7 +391,7 @@ private void InitTimer()
         {
             inputTimer = new InputTimer();
             inputTimer.Interval = TimeSpan.FromMilliseconds(400);
-            inputTimer.Tick += InputTimerElapsed;
+            inputTimer.Tick += SearchFilterInputTimerElapsed;
         }
 
         private void InstalledGames_Toggled(object sender, RoutedEventArgs e)

gamevault/UserControls/LibraryUserControl.xaml.cs

@@ -36,9 +36,9 @@ public LibraryUserControl()
             {
                 try
                 {
-                    uiFilterOrderBy.IsChecked = Preferences.Get(AppConfigKey.LastLibraryOrderBy,LoginManager.Instance.GetUserProfile().UserConfigFile) == "desc" ? true : false;
+                    uiFilterOrderBy.IsChecked = Preferences.Get(AppConfigKey.LastLibraryOrderBy, LoginManager.Instance.GetUserProfile().UserConfigFile) == "desc" ? true : false;
 
-                    string lastSortBy = Preferences.Get(AppConfigKey.LastLibrarySortBy,LoginManager.Instance.GetUserProfile().UserConfigFile);
+                    string lastSortBy = Preferences.Get(AppConfigKey.LastLibrarySortBy, LoginManager.Instance.GetUserProfile().UserConfigFile);
 
                     for (int i = 0; i < ViewModel.GameFilterSortByValues.Count; i++)
                     {
@@ -146,6 +146,10 @@ private async void ReloadLibrary_Click(object sender, EventArgs e)
 
             uiBtnReloadLibrary.IsEnabled = false;
             await Search();
+            if ((e.GetType() == typeof(KeyEventArgs) && ((KeyEventArgs)e).Key == Key.F5))
+            {
+                await MainWindowViewModel.Instance.Library.GetGameInstalls().RestoreInstalledGames();
+            }
             uiBtnReloadLibrary.IsEnabled = true;
         }
         public InstallUserControl GetGameInstalls()
@@ -276,7 +280,7 @@ private void ScrollToTop_Click(object sender, MouseButtonEventArgs e)
 
         private async void OrderBy_Changed(object sender, RoutedEventArgs e)
         {
-            Preferences.Set(AppConfigKey.LastLibraryOrderBy, (bool)uiFilterOrderBy.IsChecked ? "desc" : "asc",LoginManager.Instance.GetUserProfile().UserConfigFile);
+            Preferences.Set(AppConfigKey.LastLibraryOrderBy, (bool)uiFilterOrderBy.IsChecked ? "desc" : "asc", LoginManager.Instance.GetUserProfile().UserConfigFile);
             await Search();
         }
         private string ApplyFilter(string filter)
@@ -334,7 +338,7 @@ private async void FilterUpdated(object sender, EventArgs e)
         {
             if (sender == uiFilterSortBy)
             {
-                Preferences.Set(AppConfigKey.LastLibrarySortBy, ViewModel.SelectedGameFilterSortBy.Value,LoginManager.Instance.GetUserProfile().UserConfigFile);
+                Preferences.Set(AppConfigKey.LastLibrarySortBy, ViewModel.SelectedGameFilterSortBy.Value, LoginManager.Instance.GetUserProfile().UserConfigFile);
             }
             OpenFilterIfClosed();
             RefreshFilterCounter();

gamevault/UserControls/SettingsUserControl.xaml.cs

@@ -636,6 +636,7 @@ private async void AddRootDirectory_Click(object sender, RoutedEventArgs e)
                     ViewModel.RootDirectories.Add(new DirectoryEntry() { Uri = selectedDirectory });
                     string result = string.Join(";", ViewModel.RootDirectories.Select(entry => entry.Uri));
                     Preferences.Set(AppConfigKey.RootDirectories, result, LoginManager.Instance.GetUserProfile().UserConfigFile);
+                    await MainWindowViewModel.Instance.Library.GetGameInstalls().RestoreInstalledGames();
                 }
             }
             catch (Exception ex)
@@ -644,7 +645,7 @@ private async void AddRootDirectory_Click(object sender, RoutedEventArgs e)
             }
             ((FrameworkElement)sender).IsEnabled = true;
         }
-        private void RemoveRootDirectory_Click(object sender, RoutedEventArgs e)
+        private async void RemoveRootDirectory_Click(object sender, RoutedEventArgs e)
         {
             try
             {
@@ -654,12 +655,16 @@ private void RemoveRootDirectory_Click(object sender, RoutedEventArgs e)
                     ViewModel.RootDirectories.RemoveAt(index);
                     string result = string.Join(";", ViewModel.RootDirectories.Select(entry => entry.Uri));
                     Preferences.Set(AppConfigKey.RootDirectories, result, LoginManager.Instance.GetUserProfile().UserConfigFile);
+
+                    ((FrameworkElement)sender).IsEnabled = false;//Disable the add button to block async restoring installed games
+                    await MainWindowViewModel.Instance.Library.GetGameInstalls().RestoreInstalledGames();
                 }
             }
             catch (Exception ex)
             {
                 MainWindowViewModel.Instance.AppBarText = ex.Message;
             }
+            ((FrameworkElement)sender).IsEnabled = true;
         }
         private void OpenUserCacheFolder_Click(object sender, RoutedEventArgs e)
         {