From 1e24beed318778a49c7656d3e34b0de2b87bf6e1 Mon Sep 17 00:00:00 2001
From: Yimura <andreas.maerten@scarlet.be>
Date: Fri, 23 Jul 2021 21:15:32 +0200
Subject: [PATCH] feat(Globals): Added deep_compare function to update settings

---
 BigBaseV2/src/core/globals.hpp | 45 +++++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/BigBaseV2/src/core/globals.hpp b/BigBaseV2/src/core/globals.hpp
index bd68e34e..a5955aa1 100644
--- a/BigBaseV2/src/core/globals.hpp
+++ b/BigBaseV2/src/core/globals.hpp
@@ -36,7 +36,7 @@ struct globals {
 	struct window {
 		bool main = true;
 		bool log = false;
-		bool users = false;
+		bool users = true;
 		bool player = false;
 
 		int x;
@@ -67,6 +67,7 @@ struct globals {
 
 		this->window.log = j["window"]["log"];
 		this->window.main = j["window"]["main"];
+		this->window.users = j["window"]["users"];
 	}
 
 	nlohmann::json to_json()
@@ -93,7 +94,8 @@ struct globals {
 			{
 				"window", {
 					{ "log", this->window.log },
-					{ "main", this->window.main }
+					{ "main", this->window.main },
+					{ "users", this->window.users }
 				}
 			}
 		};
@@ -128,15 +130,7 @@ struct globals {
 
 		file >> this->options;
 
-		bool should_save = false;
-		for (auto& e : this->default_options.items())
-		{
-			if (this->options.count(e.key()) == 0)
-			{
-				should_save = true;
-				this->options[e.key()] = e.value();
-			}
-		}
+		bool should_save = this->deep_compare(this->options, this->default_options);
 
 		this->from_json(this->options);
 
@@ -150,6 +144,35 @@ struct globals {
 	}
 
 private:
+	bool deep_compare(nlohmann::json& current_settings, const nlohmann::json& default_settings)
+	{
+		bool should_save = false;
+
+		for (auto& e : default_settings.items())
+		{
+			const std::string &key = e.key();
+
+			if (current_settings.count(key) == 0)
+			{
+				current_settings[key] = e.value();
+
+				should_save = true;
+			}
+			else if (current_settings[key].is_structured() && e.value().is_structured())
+			{
+				if (deep_compare(current_settings[key], e.value()))
+					should_save = true;
+			}
+			else if (current_settings[key].type() != e.value().type()) {
+				current_settings[key] = e.value();
+
+				should_save = true;
+			}
+		}
+
+		return should_save;
+	}
+
 	bool save()
 	{
 		std::string settings_file = std::getenv("appdata");