DrakiaXYZ/AssemblyTool
DrakiaXYZ/AssemblyTool
0
0
Fork 0
Code Pull Requests Activity

Fix CLI

Browse Source
This commit is contained in:
Cj 2024-06-22 14:40:04 -04:00
parent 3c735ce506
commit 53d205e3a4
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ReCodeItCLI/Commands/DeObfuscate.cs
View File

@ -14,8 +14,8 @@ public class DeObfuscate : ICommand
public ValueTask ExecuteAsync(IConsole console) public ValueTask ExecuteAsync(IConsole console)
{ {
DataProvider.LoadAppSettings();
DataProvider.IsCli = true; DataProvider.IsCli = true;
DataProvider.LoadAppSettings();
Logger.Log("Deobfuscating assembly..."); Logger.Log("Deobfuscating assembly...");

2
ReCodeItCLI/Commands/ReMap.cs
View File

@ -25,8 +25,8 @@ public class ReMap : ICommand
public ValueTask ExecuteAsync(IConsole console) public ValueTask ExecuteAsync(IConsole console)
{ {
DataProvider.LoadAppSettings();
DataProvider.IsCli = true; DataProvider.IsCli = true;
DataProvider.LoadAppSettings();
var remapperSettings = DataProvider.Settings.Remapper.MappingSettings; var remapperSettings = DataProvider.Settings.Remapper.MappingSettings;

20
RecodeItLib/Utils/DataProvider.cs
View File

@ -1,5 +1,4 @@
using Microsoft.Win32; using Mono.Cecil;
using Mono.Cecil;
using Newtonsoft.Json; using Newtonsoft.Json;
using ReCodeIt.Models; using ReCodeIt.Models;
using ReCodeItLib.Utils; using ReCodeItLib.Utils;
@ -29,7 +28,7 @@ public static class DataProvider
public static Dictionary<string, HashSet<ScoringModel>> ScoringModels { get; set; } = []; 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; } public static AssemblyDefinition AssemblyDefinition { get; private set; }
@ -37,20 +36,14 @@ public static class DataProvider
public static void LoadAppSettings() public static void LoadAppSettings()
{ {
var settingsPath = Path.Combine(DataPath, "Settings.jsonc"); if (IsCli)
if (!File.Exists(settingsPath))
{ {
Logger.Log($"Could not find settings path `{settingsPath}`, loading defaults");
Settings = CreateFakeSettings(); Settings = CreateFakeSettings();
RegistryHelper.SetRegistryValue("SettingsPath", Path.Combine(DataPath, "Settings.json"), RegistryValueKind.String);
RegistryHelper.SetRegistryValue("LogPath", Path.Combine(DataPath, "Log.log"), RegistryValueKind.String);
SaveAppSettings();
return; return;
} }
var settingsPath = Path.Combine(DataPath, "Settings.jsonc");
var jsonText = File.ReadAllText(settingsPath); var jsonText = File.ReadAllText(settingsPath);
JsonSerializerSettings settings = new JsonSerializerSettings JsonSerializerSettings settings = new JsonSerializerSettings
@ -65,11 +58,14 @@ public static class DataProvider
public static void SaveAppSettings() public static void SaveAppSettings()
{ {
if (IsCli) { return; }
var settingsPath = RegistryHelper.GetRegistryValue<string>("SettingsPath"); var settingsPath = RegistryHelper.GetRegistryValue<string>("SettingsPath");
if (!File.Exists(settingsPath)) if (!File.Exists(settingsPath))
{ {
Logger.Log($"path `{settingsPath}` does not exist. Could not save settings", ConsoleColor.Red); Logger.Log($"path `{settingsPath}` does not exist. Could not save settings", ConsoleColor.Red);
return;
} }
JsonSerializerSettings settings = new() JsonSerializerSettings settings = new()