Added IPathStore and converted RegistryHelper to an implementation

Author: jzebedee

Installer/DependencyRegistry.cs

@@ -28,6 +28,7 @@ private static Container defaultContainer()
                 x.ForSingletonOf<IInstaller>().Use<Installer>();
 				x.ForSingletonOf<IPrompts>().Use<Prompts>();
 				x.For<IBsaDiff>().Use<BsaDiff>();
+				x.For<IPathStore>().Use<RegistryPathStore>();
 			});
         }
     }

Installer/IPathStore.cs

@@ -0,0 +1,10 @@
+using Microsoft.Win32;
+
+namespace TaleOfTwoWastelands
+{
+	public interface IPathStore
+	{
+		string GetPathFromKey(string keyName);
+		void SetPathFromKey(string keyName, string path);
+	}
+}

Installer/RegistryHelper.cs Installer/RegistryPathStore.csInstaller/RegistryHelper.cs renamed to Installer/RegistryPathStore.cs

@@ -4,9 +4,9 @@
 
 namespace TaleOfTwoWastelands
 {
-    public static class RegistryHelper
-    {
-        public static RegistryKey GetBethKey()
+    public class RegistryPathStore : IPathStore
+	{
+        public RegistryKey GetBethKey()
         {
             using (var bethKey =
                 Registry.LocalMachine.OpenSubKey(
@@ -19,7 +19,7 @@ public static RegistryKey GetBethKey()
             }
         }
 
-        public static string GetPathFromKey(string keyName)
+        public string GetPathFromKey(string keyName)
         {
             using (var bethKey = GetBethKey())
             using (var subKey = bethKey.CreateSubKey(keyName))
@@ -29,7 +29,7 @@ public static string GetPathFromKey(string keyName)
             }
         }
 
-        public static void SetPathFromKey(string keyName, string path)
+        public void SetPathFromKey(string keyName, string path)
         {
             using (var bethKey = GetBethKey())
             using (var subKey = bethKey.CreateSubKey(keyName))

Installer/SettingsPathStore.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Diagnostics;
+using Microsoft.Win32;
+
+namespace TaleOfTwoWastelands
+{
+    public class SettingsPathStore : IPathStore
+	{
+        public string GetPathFromKey(string keyName)
+        {
+			throw new NotImplementedException();
+        }
+
+        public void SetPathFromKey(string keyName, string path)
+        {
+			throw new NotImplementedException();
+		}
+    }
+}

Installer/Tale Of Two Wastelands Installer.csproj

@@ -97,6 +97,7 @@
     <Compile Include="Install\FOMOD.cs" />
     <Compile Include="Install\IInstallStep.cs" />
     <Compile Include="Install\NVSE.cs" />
+    <Compile Include="IPathStore.cs" />
     <Compile Include="Log.cs" />
     <Compile Include="Patching\Diff.cs" />
     <Compile Include="Patching\BsaDiff.cs" />
@@ -121,7 +122,8 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Game.resx</DependentUpon>
     </Compile>
-    <Compile Include="RegistryHelper.cs" />
+    <Compile Include="SettingsPathStore.cs" />
+    <Compile Include="RegistryPathStore.cs" />
     <Compile Include="Properties\Localization.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>

Installer/UI/Prompts.cs

@@ -7,24 +7,27 @@ namespace TaleOfTwoWastelands.UI
     public class Prompts : IPrompts
 	{
         private readonly FileDialog openDialog, saveDialog;
+		
         private readonly ILog Log;
+		private readonly IPathStore _store;
 
-        public string Fallout3Path { get; private set; }
+		public string Fallout3Path { get; private set; }
         public string FalloutNVPath { get; private set; }
         public string TTWSavePath { get; private set; }
 
-        public Prompts(OpenFileDialog openDialog, SaveFileDialog saveDialog, ILog log)
+        public Prompts(OpenFileDialog openDialog, SaveFileDialog saveDialog, ILog log, IPathStore store)
         {
             Log = log;
+			_store = store;
 
             this.openDialog = openDialog;
             this.saveDialog = saveDialog;
 
             if (Program.IsElevated)
             {
-                Fallout3Path = RegistryHelper.GetPathFromKey("Fallout3");
-                FalloutNVPath = RegistryHelper.GetPathFromKey("FalloutNV");
-                TTWSavePath = RegistryHelper.GetPathFromKey("TaleOfTwoWastelands");
+                Fallout3Path = store.GetPathFromKey("Fallout3");
+                FalloutNVPath = store.GetPathFromKey("FalloutNV");
+                TTWSavePath = store.GetPathFromKey("TaleOfTwoWastelands");
             }
         }
 
@@ -72,7 +75,7 @@ private string FindByUserPrompt(FileDialog dialog, string name, string keyName,
                 var path = Path.GetDirectoryName(dialog.FileName);
                 Log.File("User {2}changed {0} directory to '{1}'", name, path, manual ? "manually " : " ");
 
-                RegistryHelper.SetPathFromKey(keyName, path);
+                _store.SetPathFromKey(keyName, path);
 
                 return path;
             }

PatchMaker/Program.cs

@@ -46,7 +46,8 @@ static void Main()
             _dirTTWMain = Path.Combine(InDir, "Main Files");
             _dirTTWOptional = Path.Combine(InDir, "Optional Files");
 
-            var bethKey = RegistryHelper.GetBethKey();
+			var helper = new RegistryPathStore();
+            var bethKey = helper.GetBethKey();
 
             var fo3Key = bethKey.CreateSubKey("Fallout3");
             Debug.Assert(fo3Key != null, "fo3Key != null");