Merge pull request #32 from mstew20/Windows

Moved magic strings to appsettings

Author: TechPenguineer

src/HyperMC/HyperMcView.cs

@@ -45,7 +45,7 @@ public HyperMcView(IForgeClient forgeClient, IServiceProvider provider, IFileMan
         private async void HyperMcView_Load(object sender, EventArgs e)
         {
             SetView(new ControlView(pnl_MainArea));
-            var mods = await _fileManager.ReadFile<ModpackData[]>($@"{_settings.ModPacksPath}\packs.json");
+            var mods = await _fileManager.ReadFile<ModpackData[]>(_settings.ModPacksFile);
             if (mods != null)
             {
                 foreach (var mod in mods)
@@ -126,7 +126,7 @@ private async void ModpacksUpdated(object? sender, NotifyCollectionChangedEventA
             }
 
             SortModpacks();
-            await _fileManager.WriteToFile(_modpacks.ToArray(), $@"{_settings.ModPacksPath}\packs.json");
+            await _fileManager.WriteToFile(_modpacks.ToArray(), _settings.ModPacksFile);
         }
 
         private ModpackBox CreateModpackBox(ModpackData data)

src/HyperMC/Settings/ApplicationSettings.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Hypermc.Settings
+{
+    public class ApplicationSettings
+    {
+        public AppSettings AppSettings { get; set; }
+    }
+
+    public class AppSettings
+    {
+        public string AppPath { get; set; }
+        public string DeafultMinecraftPath { get; set; }
+        public string ModPacksFile { get; set; }
+        public string DefaultModPacksPath { get; set; }
+        public string SettingsFile { get; set; }
+    }
+}

src/HyperMC/Settings/IUserSettings.cs

@@ -8,8 +8,9 @@ namespace Hypermc.Settings
 {
     public interface IUserSettings
     {
-        string MinecraftPath { get; set; }
-        string ModPacksPath { get; set; }
+        string MinecraftPath { get; }
+        string ModPacksPath { get; }
+        string ModPacksFile { get; }
 
         Task Initialize();
     }

src/HyperMC/Settings/UserSettings.cs

@@ -1,11 +1,13 @@
 using Hypermc.Services;
+using Microsoft.Extensions.Configuration;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace Hypermc.Settings
 {
@@ -15,18 +17,21 @@ public class UserSettings : IUserSettings
         private readonly string _settingsFile;
         private readonly IFileManager _fileManager;
 
-        public string MinecraftPath { get; set; }
-        public string ModPacksPath { get; set; }
+        public string MinecraftPath { get; private set; }
+        public string ModPacksPath { get; private set; }
+        public string ModPacksFile { get; }
 
-        public UserSettings(IFileManager fileManager)
+        public UserSettings(IFileManager fileManager, IConfiguration config)
         {
-            // TODO: possibly move the file names to the appsettings.
-            _appPath = $@"{Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)}\.hypermc";
-            _settingsFile = $@"{_appPath}\settings.json";
+            var settings = config.Get<ApplicationSettings>().AppSettings;            
+            _appPath = string.Format(settings.AppPath, Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData));
+            _settingsFile = string.Format(settings.SettingsFile, _appPath);
+
             _fileManager = fileManager;
 
-            MinecraftPath = $@"{Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)}\.minecraft";
-            ModPacksPath = $@"{MinecraftPath}\ModPacks";
+            MinecraftPath = string.Format(settings.DeafultMinecraftPath, Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData));
+            ModPacksPath = string.Format(settings.DefaultModPacksPath, MinecraftPath);
+            ModPacksFile = string.Format(settings.ModPacksFile, ModPacksPath);
         }
 
         public async Task Initialize()

src/HyperMC/UI/Views/SettingView.cs

@@ -18,10 +18,6 @@ public partial class SettingView : Form, IView
 
         public SettingView(IUserSettings settings)
 		{
-			string env_flder = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
-			string mc_flder = $"{env_flder}\\.minecraft";
-			//game_path.Text = $"{mc_flder}";
-
 			InitializeComponent();
             _settings = settings;
 			game_path.Text = settings.MinecraftPath;

src/HyperMC/appsettings.json

@@ -1,3 +1,9 @@
 {
-  "test": 15
+  "AppSettings": {
+    "AppPath": "{0}\\.hypermc",
+    "DeafultMinecraftPath": "{0}\\.minecraft",
+    "DefaultModPacksPath": "{0}\\ModPacks",
+    "ModPacksFile": "{0}\\packs.json",
+    "SettingsFile":  "{0}\\settings.json"
+  }
 }