Merge pull request #34 from mstew20/Windows

Cleaned Program startup and removed unnecessary methods

Author: TechPenguineer

src/HyperMC/HyperMcView.cs

@@ -26,26 +26,27 @@ public partial class HyperMcView : Form, IViewHost
     {
 
         private readonly IForgeClient _forgeClient;
-        private readonly IServiceProvider _provider;
-        private readonly IFileManager _fileManager;
+        private readonly IDataAccess _dataAccess;
         private readonly IUserSettings _settings;
+        private readonly SettingView _settingView;
 
-        public HyperMcView(IForgeClient forgeClient, IServiceProvider provider, IFileManager fileManager, IUserSettings settings)
+        public HyperMcView(IForgeClient forgeClient, IDataAccess dataAccess, IUserSettings settings, SettingView settingView)
         {
             InitializeComponent();
 
             _forgeClient = forgeClient;
-            _provider = provider;
-            _fileManager = fileManager;
+            _dataAccess = dataAccess;
             _settings = settings;
+            _settingView = settingView;
+
             _modpacks = new();
             _modpacks.CollectionChanged += ModpacksUpdated;
         }
 
         private async void HyperMcView_Load(object sender, EventArgs e)
         {
             SetView(new ControlView(pnl_MainArea));
-            var mods = await _fileManager.ReadFile<ModpackData[]>(_settings.ModPacksFile);
+            var mods = await _dataAccess.LoadData<ModpackData[], int, ModpackData[]>(_settings.ModPacksFile);
             if (mods != null)
             {
                 foreach (var mod in mods)
@@ -126,7 +127,7 @@ private async void ModpacksUpdated(object? sender, NotifyCollectionChangedEventA
             }
 
             SortModpacks();
-            await _fileManager.WriteToFile(_modpacks.ToArray(), _settings.ModPacksFile);
+            await _dataAccess.SaveData(_settings.ModPacksFile, _modpacks.ToArray());
         }
 
         private ModpackBox CreateModpackBox(ModpackData data)
@@ -210,7 +211,7 @@ private void Hbtn_Minimize_Click(object sender, EventArgs e)
         private void Hbtn_Options_Click(object sender, EventArgs e)
         {
             //Utils.NotImplAlert("Options Menu");
-            SetView(_provider.GetRequiredService<SettingView>());
+            SetView(_settingView);
         }
 
         #endregion Minimize Button

src/HyperMC/Program.cs

@@ -21,11 +21,14 @@ static class Program
         [STAThread]
         static async Task Main()
         {
-            var builder = new ConfigurationBuilder();
-            BuildConfig(builder);
-            builder.Build();
-
             var host = Host.CreateDefaultBuilder()
+                .ConfigureAppConfiguration(builder =>
+                {
+                    builder.SetBasePath(Directory.GetCurrentDirectory())
+                        .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+                        .AddJsonFile($"appsettings.{ Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production" }.json", optional: true)
+                        .AddEnvironmentVariables();
+                })
                 .ConfigureServices((context, services) =>
                 {
                     ConfigureServices(services);
@@ -40,25 +43,15 @@ static async Task Main()
             Application.Run(host.Services.GetRequiredService<HyperMcView>());
         }
 
-        private static IServiceProvider ConfigureServices(IServiceCollection services)
+        private static void ConfigureServices(IServiceCollection services)
         {
             services.AddSingleton<HyperMcView>()
                     .AddSingleton<IUserSettings, UserSettings>();
 
             services.AddTransient<SettingView>()
-                    .AddTransient<IFileManager, FileManager>();
+                    .AddTransient<IDataAccess, FileDataAccess>();
 
             services.AddForgeClient();
-
-            return services.BuildServiceProvider();
-        }
-
-        static void BuildConfig(IConfigurationBuilder builder)
-        {
-            builder.SetBasePath(Directory.GetCurrentDirectory())
-                .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
-                .AddJsonFile($"appsettings.{ Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production" }.json", optional: true)
-                .AddEnvironmentVariables();
         }
     }
 }

src/HyperMC/Services/FileDataAccess.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+
+namespace Hypermc.Services
+{
+    public class FileDataAccess : IDataAccess
+    {
+        public async Task<O> LoadData<T, U, O>(string fileOrQuery, U parameters = default(U), string connectionStringName = null)
+        {
+            if (File.Exists(fileOrQuery))
+            {
+                using var stream = new FileStream(fileOrQuery, FileMode.Open, FileAccess.Read);
+                var settings = await JsonSerializer.DeserializeAsync<O>(stream);
+                return settings;
+            }
+
+            return default(O);
+        }
+
+        public async Task SaveData<T>(string fileOrQuery, T parametersOrData, string connectionStringName = null)
+        {
+            string settingsToSave = JsonSerializer.Serialize(parametersOrData);
+            await File.WriteAllTextAsync(fileOrQuery, settingsToSave);
+        }
+    }
+}

src/HyperMC/Services/FileManager.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Hypermc.Services
+{
+    public interface IDataAccess
+    {
+        /// <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 (can be ignored when using file based data)</param>
+        /// <param name="connectionStringName">The connection string name for the database (can be ignored when using file based data)</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 (can be ignored when using file based data)</param>
+        /// <returns></returns>
+        Task SaveData<T>(string fileOrQuery, T parametersOrData = default(T), string connectionStringName = null);
+    }
+}

src/HyperMC/Services/IDataAccess.cs

@@ -15,19 +15,19 @@ public class UserSettings : IUserSettings
     {
         private readonly string _appPath;
         private readonly string _settingsFile;
-        private readonly IFileManager _fileManager;
+        private readonly IDataAccess _dataAccess;
 
         public string MinecraftPath { get; private set; }
         public string ModPacksPath { get; private set; }
         public string ModPacksFile { get; }
 
-        public UserSettings(IFileManager fileManager, IConfiguration config)
+        public UserSettings(IDataAccess dataAccess, IConfiguration config)
         {
             var settings = config.GetSection(nameof(ApplicationSettings)).Get<ApplicationSettings>();
             _appPath = string.Format(settings.AppPath, Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData));
             _settingsFile = string.Format(settings.SettingsFile, _appPath);
 
-            _fileManager = fileManager;
+            _dataAccess = dataAccess;
 
             MinecraftPath = string.Format(settings.DeafultMinecraftPath, Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData));
             ModPacksPath = string.Format(settings.DefaultModPacksPath, MinecraftPath);
@@ -46,7 +46,7 @@ public async Task Initialize()
                 Directory.CreateDirectory(ModPacksPath);
             }
 
-            var settings = await _fileManager.ReadFile<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 _fileManager.WriteToFile(this, _settingsFile);
+            await _dataAccess.SaveData(_settingsFile, this);
         }
     }
 }