From 53d205e3a4a28ee03af8d349213ccd7632cb877f Mon Sep 17 00:00:00 2001
From: Cj <161484149+CJ-SPT@users.noreply.github.com>
Date: Sat, 22 Jun 2024 14:40:04 -0400
Subject: [PATCH] Fix CLI

---
 ReCodeItCLI/Commands/DeObfuscate.cs |  2 +-
 ReCodeItCLI/Commands/ReMap.cs       |  2 +-
 RecodeItLib/Utils/DataProvider.cs   | 20 ++++++++------------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/ReCodeItCLI/Commands/DeObfuscate.cs b/ReCodeItCLI/Commands/DeObfuscate.cs
index a4d5714..ff5cd74 100644
--- a/ReCodeItCLI/Commands/DeObfuscate.cs
+++ b/ReCodeItCLI/Commands/DeObfuscate.cs
@@ -14,8 +14,8 @@ public class DeObfuscate : ICommand
 
     public ValueTask ExecuteAsync(IConsole console)
     {
-        DataProvider.LoadAppSettings();
         DataProvider.IsCli = true;
+        DataProvider.LoadAppSettings();
 
         Logger.Log("Deobfuscating assembly...");
 
diff --git a/ReCodeItCLI/Commands/ReMap.cs b/ReCodeItCLI/Commands/ReMap.cs
index 64494d6..38ea678 100644
--- a/ReCodeItCLI/Commands/ReMap.cs
+++ b/ReCodeItCLI/Commands/ReMap.cs
@@ -25,8 +25,8 @@ public class ReMap : ICommand
 
     public ValueTask ExecuteAsync(IConsole console)
     {
-        DataProvider.LoadAppSettings();
         DataProvider.IsCli = true;
+        DataProvider.LoadAppSettings();
 
         var remapperSettings = DataProvider.Settings.Remapper.MappingSettings;
 
diff --git a/RecodeItLib/Utils/DataProvider.cs b/RecodeItLib/Utils/DataProvider.cs
index 9d8d9f6..83da3d0 100644
--- a/RecodeItLib/Utils/DataProvider.cs
+++ b/RecodeItLib/Utils/DataProvider.cs
@@ -1,5 +1,4 @@
-using Microsoft.Win32;
-using Mono.Cecil;
+using Mono.Cecil;
 using Newtonsoft.Json;
 using ReCodeIt.Models;
 using ReCodeItLib.Utils;
@@ -29,7 +28,7 @@ public static class DataProvider
 
     public static Dictionary<string, HashSet<ScoringModel>> ScoringModels { get; set; } = [];
 
-    public static Settings Settings { get; set; }
+    public static Settings Settings { get; private set; }
 
     public static AssemblyDefinition AssemblyDefinition { get; private set; }
 
@@ -37,20 +36,14 @@ public static class DataProvider
 
     public static void LoadAppSettings()
     {
-        var settingsPath = Path.Combine(DataPath, "Settings.jsonc");
-
-        if (!File.Exists(settingsPath))
+        if (IsCli)
         {
-            Logger.Log($"Could not find settings path `{settingsPath}`, loading defaults");
             Settings = CreateFakeSettings();
-
-            RegistryHelper.SetRegistryValue("SettingsPath", Path.Combine(DataPath, "Settings.json"), RegistryValueKind.String);
-            RegistryHelper.SetRegistryValue("LogPath", Path.Combine(DataPath, "Log.log"), RegistryValueKind.String);
-
-            SaveAppSettings();
             return;
         }
 
+        var settingsPath = Path.Combine(DataPath, "Settings.jsonc");
+
         var jsonText = File.ReadAllText(settingsPath);
 
         JsonSerializerSettings settings = new JsonSerializerSettings
@@ -65,11 +58,14 @@ public static class DataProvider
 
     public static void SaveAppSettings()
     {
+        if (IsCli) { return; }
+
         var settingsPath = RegistryHelper.GetRegistryValue<string>("SettingsPath");
 
         if (!File.Exists(settingsPath))
         {
             Logger.Log($"path `{settingsPath}` does not exist. Could not save settings", ConsoleColor.Red);
+            return;
         }
 
         JsonSerializerSettings settings = new()