Merge branch 'master' of https://github.com/TaleOfTwoWastelands/ESPSharp-GUI

Author: Gribbleshnibit8

ESPSharp GUI/DockableForms/LoadListWindow.cs

@@ -26,26 +26,10 @@ public LoadListWindow()
 		/// </summary>
 		private void ReadPluginFiles()
 		{
-			using (var reader = new StreamReader(Util.AllPluginsPath))
-			{
-				while (reader.Peek() >= 0)
-				{
-					var pluginName = reader.ReadLine();
-					if (pluginName == null) continue;
-					if (pluginName.EndsWith(".esp") || pluginName.EndsWith(".esm"))
-						lvPluginList.Items.Add(pluginName);
-				}
-			}
-			using (var reader = new StreamReader(Util.LoadedPluginsPath))
-			{
-				while (reader.Peek() >= 0)
-				{
-					var pluginName = reader.ReadLine();
-					if (pluginName == null) continue;
-					if (pluginName.EndsWith(".esp") || pluginName.EndsWith(".esm"))
-						lvPluginList.FindItemWithText(pluginName).Checked = true;
-				}
-			}
+            foreach (var plugin in Settings.AllPlugins)
+                lvPluginList.Items.Add(Path.GetFileName(plugin));
+            foreach (var plugin in Settings.ActivePlugins)
+                lvPluginList.FindItemWithText(plugin).Checked = true;
 		}
 
 		/// <summary>
@@ -57,8 +41,11 @@ private async void buttonOK_Click(object sender, EventArgs e)
 		{
 			_instance.Hide();
 
-			// Build paths using the local data directory and the known plugin names.
-			var paths = (from ListViewItem item in lvPluginList.Items where item.Checked select Path.Combine(Util.DataPath, item.Text)).ToArray();
+            // Build paths using the local data directory and the known plugin names.
+            var paths = (from ListViewItem item 
+                         in lvPluginList.Items
+                         where item.Checked
+                         select Path.Combine(Settings.DataPath, item.Text)).ToArray();
 
 			var progress = new Progress<string>(update =>
 			{

ESPSharp GUI/ESPSharp GUI.csproj

@@ -159,6 +159,7 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Utilities\PluginData.cs" />
+    <Compile Include="Utilities\Settings.cs" />
     <Compile Include="Utilities\Util.cs" />
     <EmbeddedResource Include="Controls\ButtonTextBox.resx">
       <DependentUpon>ButtonTextBox.cs</DependentUpon>

ESPSharp GUI/Utilities/PluginData.cs

@@ -25,8 +25,7 @@ public static void OpenPlugins(string[] files, IProgress<string> progress)
 			Plugins = new List<ElderScrollsPlugin>();
 			ElderScrollsPlugin.Clear();
 
-			ElderScrollsPlugin.pluginLocations.Add(new KeyValuePair<string, bool>(Util.DataPath, false));
-			ElderScrollsPlugin.pluginLocations.Add(new KeyValuePair<string, bool>(Util.MOPath, true));
+			ElderScrollsPlugin.pluginLocations.Add(new KeyValuePair<string, bool>(Settings.DataPath, false));
 
 			foreach (var file in files)
 			{

ESPSharp GUI/Utilities/Settings.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.IO;
+using System.Windows.Forms;
+
+namespace ESPSharp_GUI.Utilities
+{
+    public static class Settings
+    {
+        public static List<string> AllPlugins
+        {
+            get
+            {
+                return Directory.EnumerateFiles(DataPath)
+                    .Where(f => Path.GetExtension(f).ToLower() == ".esm" || Path.GetExtension(f).ToLower() == ".esp")
+                    .OrderBy(file => new FileInfo(file).LastWriteTime)
+                    .ToList();
+            }
+        }
+
+        public static List<string> ActivePlugins
+        {
+            get
+            {
+                using (FileStream stream = new FileStream(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "FalloutNV", "plugins.txt"), FileMode.Open, FileAccess.Read))
+                using (StreamReader reader = new StreamReader(stream))
+                {
+                    List<string> activePlugins = new List<string>();
+                    string line;
+                    do
+                    {
+                        line = reader.ReadLine();
+                        if (line == null)
+                            break;
+                        activePlugins.Add(line);
+                    }
+                    while (line != "" && !reader.EndOfStream);
+                    return activePlugins;
+                }
+            }
+        }
+
+        public static string DataPath
+        {
+            get
+            {
+                return Path.Combine(Util.GamePath, "Data");
+            }
+        }
+    }
+}

ESPSharp GUI/Utilities/Util.cs

@@ -10,48 +10,33 @@ public class Util
 	{
 		public static string CurrentPath = Application.ExecutablePath;
 
-		//public static string AllPluginsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Fallout4", "loadorder.txt");
-
-
-		//public static string LoadedPluginsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-		//	"Fallout4", "plugins.txt");
-
-			// Because ModOrganizer keeps them in different locations
-		public static string AllPluginsPath =
-			@"G:\Games\Steam\steamapps\common\fallout new vegas\ModOrganizer\profiles\New Vegas\loadorder.txt";
-
-		public static string LoadedPluginsPath =
-			@"G:\Games\Steam\steamapps\common\fallout new vegas\ModOrganizer\profiles\New Vegas\plugins.txt";
-
-		public static string DataPath = @"G:\Games\Steam\steamapps\common\fallout new vegas\Data";
-
-		public static string MOPath = @"G:\Games\Steam\steamapps\common\fallout new vegas\ModOrganizer\mods";
-
-		public RegistryKey GetBethKey()
-		{
-			using (var bethKey =
-				Registry.LocalMachine.OpenSubKey(
-				//determine software reg path (depends on architecture)
-				Environment.Is64BitOperatingSystem ? "Software\\Wow6432Node" : "Software", RegistryKeyPermissionCheck.ReadWriteSubTree))
-			//create or retrieve BethSoft path
-			{
-				Debug.Assert(bethKey != null, "bethKey != null");
-				return bethKey.CreateSubKey("Bethesda Softworks", RegistryKeyPermissionCheck.ReadWriteSubTree);
-			}
-		}
-
-		public string GetPathFromKey(string keyName)
-		{
-			using (var bethKey = GetBethKey())
-			using (var subKey = bethKey.CreateSubKey(keyName))
-			{
-				Debug.Assert(subKey != null, "subKey != null");
-				return subKey.GetValue("Installed Path", "").ToString();
-			}
-		}
-
-
-
-
+		public static RegistryKey BethesdaRegKey
+        {
+            get
+            {
+                using (var bethKey =
+                    Registry.LocalMachine.OpenSubKey(
+                    //determine software reg path (depends on architecture)
+                    Environment.Is64BitOperatingSystem ? "Software\\Wow6432Node" : "Software", RegistryKeyPermissionCheck.ReadWriteSubTree))
+                //create or retrieve BethSoft path
+                {
+                    Debug.Assert(bethKey != null, "bethKey != null");
+                    return bethKey.CreateSubKey("Bethesda Softworks", RegistryKeyPermissionCheck.ReadWriteSubTree);
+                }
+            }
+        }
+
+		public static string GamePath
+        {
+            get
+            {
+                using (BethesdaRegKey)
+                using (var subKey = BethesdaRegKey.CreateSubKey("falloutnv"))
+                {
+                    Debug.Assert(subKey != null, "subKey != null");
+                    return subKey.GetValue("Installed Path", "").ToString();
+                }
+            }
+        }
 	}
 }