WIP: further modifed the DataAcess to be able to utilize different services if needed.

Author: mstew20

src/HyperMC/HyperMcView.cs

@@ -46,7 +46,7 @@ public HyperMcView(IForgeClient forgeClient, IDataAccess dataAccess, IUserSettin
         private async void HyperMcView_Load(object sender, EventArgs e)
         {
             SetView(new ControlView(pnl_MainArea));
-            var mods = await _dataAccess.LoadData<ModpackData[]>(_settings.ModPacksFile);
+            var mods = await _dataAccess.LoadData<ModpackData[], int, ModpackData[]>(_settings.ModPacksFile);
             if (mods != null)
             {
                 foreach (var mod in mods)
@@ -127,7 +127,7 @@ private async void ModpacksUpdated(object? sender, NotifyCollectionChangedEventA
             }
 
             SortModpacks();
-            await _dataAccess.SaveData(_modpacks.ToArray(), _settings.ModPacksFile);
+            await _dataAccess.SaveData(_settings.ModPacksFile, _modpacks.ToArray());
         }
 
         private ModpackBox CreateModpackBox(ModpackData data)

src/HyperMC/Services/FileDataAccess.cs

@@ -10,31 +10,22 @@ namespace Hypermc.Services
 {
     public class FileDataAccess : IDataAccess
     {
-        public async Task<T> LoadData<T>(string file)
+        public async Task<O> LoadData<T, U, O>(string fileOrQuery, U parameters = default(U), string connectionStringName = null)
         {
-            if (File.Exists(file))
+            if (File.Exists(fileOrQuery))
             {
-                using var stream = new FileStream(file, FileMode.Open, FileAccess.Read);
-                var settings = await JsonSerializer.DeserializeAsync<T>(stream);
+                using var stream = new FileStream(fileOrQuery, FileMode.Open, FileAccess.Read);
+                var settings = await JsonSerializer.DeserializeAsync<O>(stream);
                 return settings;
             }
 
-            return default(T);
+            return default(O);
         }
 
-        public async Task SaveData<T>(T data, string file)
+        public async Task SaveData<T>(string fileOrQuery, T parametersOrData, string connectionStringName = null)
         {
-            string settingsToSave = JsonSerializer.Serialize(data);
-            await File.WriteAllTextAsync(file, settingsToSave);
-        }
-
-        public Task<List<T>> LoadData<T, U>(string query, U parameters, string connectionStringName)
-        {
-            return null;
-        }
-        public Task SaveData<T>(string query, T parameters, string connectionStringName)
-        {
-            return null;
+            string settingsToSave = JsonSerializer.Serialize(parametersOrData);
+            await File.WriteAllTextAsync(fileOrQuery, settingsToSave);
         }
     }
 }

src/HyperMC/Services/IDataAccess.cs

@@ -8,9 +8,26 @@ namespace Hypermc.Services
 {
     public interface IDataAccess
     {
-        Task SaveData<T>(T data, string file);
-        Task<T> LoadData<T>(string file);
-        Task<List<T>> LoadData<T, U>(string query, U parameters, string connectionStringName);
-        Task SaveData<T>(string query, T parameters, string connectionStringName);
+        /// <summary>
+        /// Loads data from a file or database
+        /// </summary>
+        /// <typeparam name="T">The input type for the data that you want to be loaded</typeparam>
+        /// <typeparam name="U">The type of the data that is being passed in to be saved</typeparam>
+        /// <typeparam name="O">The return type</typeparam>
+        /// <param name="fileOrQuery">The file name or query string to run</param>
+        /// <param name="parameters">The data to query the database on</param>
+        /// <param name="connectionStringName">The connection string name for the database</param>
+        /// <returns></returns>
+        Task<O> LoadData<T, U, O>(string fileOrQuery, U parameters = default(U), string connectionStringName = null);
+
+        /// <summary>
+        /// Saves data to a file or database
+        /// </summary>
+        /// <typeparam name="T">The data type that is being passed in</typeparam>
+        /// <param name="fileOrQuery">The file name or query string to run</param>
+        /// <param name="parametersOrData">The data to be saved to the file or database</param>
+        /// <param name="connectionStringName">The connection string name for the database</param>
+        /// <returns></returns>
+        Task SaveData<T>(string fileOrQuery, T parametersOrData = default(T), string connectionStringName = null);
     }
 }

src/HyperMC/Settings/UserSettings.cs

@@ -46,7 +46,7 @@ public async Task Initialize()
                 Directory.CreateDirectory(ModPacksPath);
             }
 
-            var settings = await _dataAccess.LoadData<UserSettings>(_settingsFile);
+            var settings = await _dataAccess.LoadData<UserSettings, int, UserSettings>(_settingsFile);
 
             if (settings != null)
             {
@@ -60,7 +60,7 @@ public async Task UpdateSettings(string mcPath, string modPath)
             MinecraftPath = mcPath;
             ModPacksPath = modPath;
 
-            await _dataAccess.SaveData(this, _settingsFile);
+            await _dataAccess.SaveData(_settingsFile, this);
         }
     }
 }