Working loading, Saving and default config functions

Source/HarmonyLink/Public/Enums/Profile.h

@@ -0,0 +1,18 @@
+// Copyright (C) 2024 Jordon Brooks
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Profile.generated.h"
+
+/*
+ * Enum representing different operating system platforms.
+ */
+UENUM(BlueprintType)
+enum class EProfile : uint8
+{
+	NONE UMETA(DisplayName = "NONE"),
+	BATTERY UMETA(DisplayName = "BATTERY"),
+	CHARGING UMETA(DisplayName = "CHARGING"),
+	DOCKED UMETA(DisplayName = "DOCKED"),
+};

Source/HarmonyLink/Public/Objects/HarmonyLinkGraphics.h

@@ -3,7 +3,8 @@
 #pragma once
 
 #include "CoreMinimal.h"
-#include "Structs/HLConfigValue.h"
+#include "Enums/Profile.h"
+#include "Structs/SettingsProfile.h"
 
 #include "UObject/Object.h"
 #include "HarmonyLinkGraphics.generated.h"
@@ -20,20 +21,14 @@ public:
 	UHarmonyLinkGraphics();
 	
 	UFUNCTION(BlueprintCallable, Category="HarmonyLink Settings")
-	void LoadProfile(const FName& ProfileName, const bool bForceReload = false);
+	void LoadConfig(const bool bForceReload = false);
 
 	UFUNCTION(BlueprintCallable, Category="HarmonyLink Settings")
-	void SaveProfile(const FName& ProfileName);
+	void SaveConfig() const;
 
 	UFUNCTION(BlueprintCallable, Category="HarmonyLink Settings", meta=(bCheckForCommandLineOverrides=true))
 	void ApplySettings(bool bCheckForCommandLineOverrides = true);
 
-	UFUNCTION(BlueprintCallable, Category="HarmonyLink Settings")
-	void ApplyNonResolutionSettings();
-
-	UFUNCTION(BlueprintCallable, Category="HarmonyLink Settings")
-	void ApplyResolutionSettings(bool bCheckForCommandLineOverrides);
-
 	/** Returns the game local machine settings (resolution, windowing mode, scalability settings, etc...) */
 	UFUNCTION(BlueprintCallable, Category="HarmonyLink Settings")
 	static UHarmonyLinkGraphics* GetSettings();
@@ -42,29 +37,30 @@ public:
 
 private:
 	void CreateDefaultConfigFile();
-	bool LoadSettingsFromConfig(const FString& SectionName);
+	bool LoadSettingsFromConfig();
 
-	void SaveSection(const FName& SectionName, const TMap<FName, FHLConfigValue>& Settings) const;
+	bool LoadSection(const FConfigFile& ConfigFile, const TPair<EProfile, FName> Profile);
+
+	void SaveSection(FSettingsProfile& SettingsProfile, const bool bFlush = false) const;
+
+	void LoadDefaults();
+
+	void DebugPrintProfiles() const;
+	static void PrintDebugSection(FSettingsProfile& SettingsProfile);
 
 	static void ResetInstance();
 
-	UPROPERTY(Config)
-	FName _ProfileName = NAME_None;
-
 	static FString IniLocation;
-	
-	static FName BatteryProfile;
-	static FName ChargingProfile;
-	static FName DockedProfile;
 
-	TMap<FName, int32> SettingsMap;
+	TMap<EProfile, FName> ProfileNames = {
+		{EProfile::BATTERY, "Battery"},
+		{EProfile::CHARGING, "Charging"},
+		{EProfile::DOCKED, "Docked"},
+	};
 
-	// Maps to store configuration settings for each profile
-	TMap<FName, FHLConfigValue> BatterySettings;
-	TMap<FName, FHLConfigValue> ChargingSettings;
-	TMap<FName, FHLConfigValue> DockedSettings;
+	TMap<EProfile, FSettingsProfile> Profiles;
 
-	static TMap<FName, int32> DefaultSettingsMap;
+	static TMap<FName, TMap<FName, FHLConfigValue>> DefaultSettings;
 
 	static UHarmonyLinkGraphics* Instance;
 };

Source/HarmonyLink/Public/Structs/HLConfigValue.h

@@ -53,6 +53,34 @@ public:
 
 	template <typename T>
 	T GetValue() const;
+
+	// Equality operators
+	bool operator==(const FHLConfigValue& Other) const
+	{
+		if (Type != Other.Type)
+		{
+			return false;
+		}
+
+		switch (Type)
+		{
+		case EConfigValueType::Int:
+			return IntValue == Other.IntValue;
+		case EConfigValueType::Float:
+			return FloatValue == Other.FloatValue;
+		case EConfigValueType::Bool:
+			return BoolValue == Other.BoolValue;
+		case EConfigValueType::String:
+			return StringValue == Other.StringValue;
+		default:
+			return false;
+		}
+	}
+
+	bool operator!=(const FHLConfigValue& Other) const
+	{
+		return !(*this == Other);
+	}
 };
 
 // Specializations of the templated getter
@@ -83,3 +111,27 @@ inline FString FHLConfigValue::GetValue<FString>() const
 	ensure(Type == EConfigValueType::String);
 	return StringValue;
 }
+
+// Hash function
+FORCEINLINE uint32 GetTypeHash(const FHLConfigValue& Value)
+{
+	uint32 Hash = GetTypeHash(Value.GetType());
+
+	switch (Value.GetType())
+	{
+	case EConfigValueType::Int:
+		Hash = HashCombine(Hash, GetTypeHash(Value.GetValue<int32>()));
+		break;
+	case EConfigValueType::Float:
+		Hash = HashCombine(Hash, GetTypeHash(Value.GetValue<float>()));
+		break;
+	case EConfigValueType::Bool:
+		Hash = HashCombine(Hash, GetTypeHash(Value.GetValue<bool>()));
+		break;
+	case EConfigValueType::String:
+		Hash = HashCombine(Hash, GetTypeHash(Value.GetValue<FString>()));
+		break;
+	}
+
+	return Hash;
+}

Source/HarmonyLink/Public/Structs/SettingsProfile.h

@@ -0,0 +1,45 @@
+// Copyright (C) 2024 Jordon Brooks
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "HLConfigValue.h"
+
+#include "SettingsProfile.generated.h"
+
+USTRUCT(BlueprintType)
+struct FSettingsProfile
+{
+	GENERATED_BODY()
+	
+	UPROPERTY()
+	FName SectionName;
+    
+    UPROPERTY()
+	TMap<FName, FHLConfigValue> Settings;
+
+	// Equality operators
+	bool operator==(const FSettingsProfile& Other) const
+	{
+		return SectionName == Other.SectionName && Settings.OrderIndependentCompareEqual(Other.Settings);
+	}
+
+	bool operator!=(const FSettingsProfile& Other) const
+	{
+		return !(*this == Other);
+	}
+};
+
+// Hash function
+FORCEINLINE uint32 GetTypeHash(const FSettingsProfile& Profile)
+{
+	uint32 Hash = GetTypeHash(Profile.SectionName);
+
+	for (const auto& Pair : Profile.Settings)
+	{
+		Hash = HashCombine(Hash, GetTypeHash(Pair.Key));
+		Hash = HashCombine(Hash, GetTypeHash(Pair.Value));
+	}
+
+	return Hash;
+}