commit before switching to a BlockingCollection solution

Author: sharpjd

GPUPrefSwitcher/AppEntrySaveHandler.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -15,27 +16,12 @@ public class AppEntrySaveHandler
         /// !!! This should always contain deep copies !!!
         /// </summary>
         private List<AppEntry> prevAppEntries;
-        /*
-        private List<AppEntry> prevAppEntries
-        {
-            get
-            {
-                return prevAppEntries_;
-            }
-            set
-            {
-                Logger.inst.Log("Set PrevAppEntries");
-                prevAppEntries_ = value;
-            }
-        }
-        private List<AppEntry> prevAppEntries_;
-        */
 
         public IReadOnlyList<AppEntry> CurrentAppEntries
         {
             get
             {
-                return currentAppEntries.AsReadOnly();
+                return currentAppEntries;
             }
         }
         private List<AppEntry> currentAppEntries;
@@ -98,7 +84,7 @@ public AppEntrySaveHandler()
             //Logger.inst.Log(prevAppEntries.Single(x => x.AppPath == "F:\\SteamLibrary\\steamapps\\common\\Apex Legends\\r5apex.exe").ToString());
         }
 
-        public void ChangeAppEntryByPathAndSave(string path, AppEntry updatedAppEntry)
+        public void ChangeAppEntryByPath(string path, AppEntry updatedAppEntry)
         {
             try
             {
@@ -124,24 +110,6 @@ public void ChangeAppEntryByPathAndSave(string path, AppEntry updatedAppEntry)
             }
         }
 
-        public int RemoveAll(Predicate<AppEntry> predicate)
-        {
-            return currentAppEntries.RemoveAll(predicate);
-        }
-
-        public void AddAppEntryAndSave(AppEntry appEntry)
-        {
-            try
-            {
-                semaphoreSlim.Wait();
-
-                currentAppEntries.Add(appEntry);
-
-                SaveAppEntryChanges_Internal();
-
-            }
-            finally { semaphoreSlim.Release(); }
-        }
         /*
          * DECISION: Replacement or overwrite?
          * Per-Entry Replacement (SELECTED):

GPUPrefSwitcher/FileSwapper.cs

@@ -260,7 +260,7 @@ private async Task InitiateSingleFileSwap(FileSwapPathTask fileSwapPathTask, int
 
                     Logger.inst.Log($"Saving SwapPath state for SwapPath {swapPath} for app {AppEntry.AppPath}");
                     //await new Task(new Action( () => preferencesXML.ModifyAppEntryAndSave(AppEntry.AppPath, modified)));
-                    AppEntrySaveHandler.ChangeAppEntryByPathAndSave(AppEntry.AppPath, modified);
+                    AppEntrySaveHandler.ChangeAppEntryByPath(AppEntry.AppPath, modified);
                     //AppEntrySaveHandler.SaveAppEntryChanges();
 
                     string s3 = $"Saved SwapPath state for SwapPath {swapPath} for app {AppEntry.AppPath}";
@@ -307,7 +307,7 @@ private async Task InitiateSingleFileSwap(FileSwapPathTask fileSwapPathTask, int
                     AppEntry modified = AppEntry; //struct copy
                     modified.SwapperStates[swapPathIndex] = PowerLineStatus.Online;
 
-                    AppEntrySaveHandler.ChangeAppEntryByPathAndSave(AppEntry.AppPath, modified);
+                    AppEntrySaveHandler.ChangeAppEntryByPath(AppEntry.AppPath, modified);
                     //AppEntrySaveHandler.SaveAppEntryChanges();
                     string s3 = $"Saved SwapPath state for SwapPath {swapPath} for app {AppEntry.AppPath}";
                     Logger.inst.Log(s3);

GPUPrefSwitcher/Switcher.cs

@@ -269,11 +269,11 @@ private static void UpdateSeenInRegistryStatuses()
                 if (regPathValues.Contains(appEntry.AppPath)){
                     if (appEntry.SeenInRegistry == false)
                     {
-                        appEntrySaveHandler.ChangeAppEntryByPathAndSave(appEntry.AppPath, appEntry with { SeenInRegistry = true });
+                        appEntrySaveHandler.ChangeAppEntryByPath(appEntry.AppPath, appEntry with { SeenInRegistry = true });
                     }
                 } else
                 {
-                    appEntrySaveHandler.ChangeAppEntryByPathAndSave(appEntry.AppPath, appEntry with { SeenInRegistry = false });
+                    appEntrySaveHandler.ChangeAppEntryByPath(appEntry.AppPath, appEntry with { SeenInRegistry = false });
                 }
             }
             //appEntrySaveHandler.SaveAppEntryChanges();
@@ -470,7 +470,7 @@ internal static void WriteXMLToRegistry(PowerLineStatus powerLineStatus)
 
                     AppEntry modifiedAppEntry = appEntry with { PendingAddToRegistry = false } ;
 
-                    appEntrySaveHandler.ChangeAppEntryByPathAndSave(appEntry.AppPath, modifiedAppEntry);
+                    appEntrySaveHandler.ChangeAppEntryByPath(appEntry.AppPath, modifiedAppEntry);
                     //appEntrySaveHandler.SaveAppEntryChanges();
                 }
 

GPUPrefSwitcherGUI/MainForm.cs

@@ -227,7 +227,7 @@ private void dataGridView1_CellContentClick(object sender, DataGridViewCellEvent
             }
 
             AppEntry updatedAppEntry = appEntryFromRow(e.RowIndex);
-            appEntrySaver.ChangeAppEntryByPathAndSave(updatedAppEntry.AppPath, updatedAppEntry);
+            appEntrySaver.ChangeAppEntryByPath(updatedAppEntry.AppPath, updatedAppEntry);
 
             if (e.ColumnIndex == ConfigureCol)
             {
@@ -237,7 +237,7 @@ private void dataGridView1_CellContentClick(object sender, DataGridViewCellEvent
                 if (form.DialogResult == DialogResult.OK)
                 {
                     AppEntry returned = form.CurrentAppEntry;
-                    appEntrySaver.ChangeAppEntryByPathAndSave(updatedAppEntry.AppPath, returned);
+                    appEntrySaver.ChangeAppEntryByPath(updatedAppEntry.AppPath, returned);
                     UpdateGrid();
                 }
 
@@ -302,7 +302,7 @@ private void dataGridView_CellEndEdit(object sender, DataGridViewCellEventArgs e
             //object updatedValue = dataGridView1[e.ColumnIndex, e.RowIndex].Value;
 
             AppEntry updatedAppEntry = appEntryFromRow(e.RowIndex);
-            appEntrySaver.ChangeAppEntryByPathAndSave(updatedAppEntry.AppPath, updatedAppEntry);
+            appEntrySaver.ChangeAppEntryByPath(updatedAppEntry.AppPath, updatedAppEntry);
 
             //this should come after replacing the AppEntry
             UpdateActionButtons();