feat(scripting/config): Fetch table

skuzzis · skuzzis · commit 7c417bfcf798 · 2024-08-11T14:16:23.000Z
diff --git a/src/configuration/Configuration.cpp b/src/configuration/Configuration.cpp
@@ -12,7 +12,7 @@ bool ConfigurationError(std::string configuration_file, std::string error)
     return false;
 }
 
-void WritePluginFile(std::string path, rapidjson::Value &val)
+void WritePluginFile(std::string path, rapidjson::Value& val)
 {
     rapidjson::StringBuffer buffer;
     rapidjson::PrettyWriter<rapidjson::StringBuffer> writer(buffer);
@@ -23,9 +23,18 @@ void WritePluginFile(std::string path, rapidjson::Value &val)
     Files::Write(path, content, false);
 }
 
-rapidjson::Value &GetJSONDoc(rapidjson::Document &doc, std::string key, rapidjson::Value &defaultValue, bool &wasCreated)
+std::string JSONToString(rapidjson::Value& val)
 {
-    rapidjson::Value *currentDoc = &doc;
+    rapidjson::StringBuffer buffer;
+    rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+
+    val.Accept(writer);
+    return buffer.GetString();
+}
+
+rapidjson::Value& GetJSONDoc(rapidjson::Document& doc, std::string key, rapidjson::Value& defaultValue, bool& wasCreated)
+{
+    rapidjson::Value* currentDoc = &doc;
     auto keys = explode(key, ".");
 
     while (keys.size() > 1)
@@ -51,13 +60,13 @@ rapidjson::Value &GetJSONDoc(rapidjson::Document &doc, std::string key, rapidjso
 }
 
 template <class T>
-void RegisterConfiguration(bool &wasCreated, rapidjson::Document &document, std::string configFilePath, std::string config_prefix, std::string key, T default_value)
+void RegisterConfiguration(bool& wasCreated, rapidjson::Document& document, std::string configFilePath, std::string config_prefix, std::string key, T default_value)
 {
     rapidjson::Value defaultValue;
 
     if constexpr (std::is_same<T, std::string>::value)
         defaultValue.SetString(default_value.c_str(), document.GetAllocator());
-    else if constexpr (std::is_same<T, const char *>::value)
+    else if constexpr (std::is_same<T, const char*>::value)
         defaultValue.SetString(default_value, document.GetAllocator());
     else if constexpr (std::is_same<T, bool>::value)
         defaultValue.SetBool(default_value);
@@ -82,7 +91,7 @@ void RegisterConfiguration(bool &wasCreated, rapidjson::Document &document, std:
     else if constexpr (std::is_same<T, double>::value)
         defaultValue.SetDouble(default_value);
 
-    rapidjson::Value &jsonDoc = GetJSONDoc(document, key, defaultValue, wasCreated);
+    rapidjson::Value& jsonDoc = GetJSONDoc(document, key, defaultValue, wasCreated);
 
     if constexpr (std::is_same<T, std::string>::value)
     {
@@ -94,7 +103,7 @@ void RegisterConfiguration(bool &wasCreated, rapidjson::Document &document, std:
 
         g_Config->SetValue(config_prefix + "." + key, std::string(jsonDoc.GetString()));
     }
-    else if constexpr (std::is_same<T, const char *>::value)
+    else if constexpr (std::is_same<T, const char*>::value)
     {
         if (!jsonDoc.IsString())
         {
@@ -216,17 +225,17 @@ void RegisterConfiguration(bool &wasCreated, rapidjson::Document &document, std:
 }
 
 template <class T>
-void RegisterConfigurationVector(bool &wasCreated, rapidjson::Document &document, std::string configFilePath, std::string config_prefix, std::string key, std::vector<T> default_value, bool shouldImplode, std::string delimiter)
+void RegisterConfigurationVector(bool& wasCreated, rapidjson::Document& document, std::string configFilePath, std::string config_prefix, std::string key, std::vector<T> default_value, bool shouldImplode, std::string delimiter)
 {
     rapidjson::Value defaultValue(rapidjson::kArrayType);
 
-    for (const T &val : default_value)
+    for (const T& val : default_value)
     {
         rapidjson::Value defVal;
 
         if constexpr (std::is_same<T, std::string>::value)
             defVal.SetString(val.c_str(), document.GetAllocator());
-        else if constexpr (std::is_same<T, const char *>::value)
+        else if constexpr (std::is_same<T, const char*>::value)
             defVal.SetString(val, document.GetAllocator());
         else if constexpr (std::is_same<T, bool>::value)
             defVal.SetBool(val);
@@ -254,7 +263,7 @@ void RegisterConfigurationVector(bool &wasCreated, rapidjson::Document &document
         defaultValue.PushBack(defVal, document.GetAllocator());
     }
 
-    rapidjson::Value &jsonDoc = GetJSONDoc(document, key, defaultValue, wasCreated);
+    rapidjson::Value& jsonDoc = GetJSONDoc(document, key, defaultValue, wasCreated);
 
     if (!jsonDoc.IsArray())
     {
@@ -278,7 +287,7 @@ void RegisterConfigurationVector(bool &wasCreated, rapidjson::Document &document
 
             result.push_back(std::string(arr[i].GetString()));
         }
-        else if constexpr (std::is_same<T, const char *>::value)
+        else if constexpr (std::is_same<T, const char*>::value)
         {
             if (!arr[i].IsString())
             {
@@ -397,11 +406,11 @@ void RegisterConfigurationVector(bool &wasCreated, rapidjson::Document &document
     if (shouldImplode)
     {
         std::vector<std::string> implodeArr;
-        for (const T &val : result)
+        for (const T& val : result)
         {
             if constexpr (std::is_same<T, std::string>::value)
                 implodeArr.push_back(val);
-            else if constexpr (std::is_same<T, const char *>::value)
+            else if constexpr (std::is_same<T, const char*>::value)
                 implodeArr.push_back(std::string(val));
             else
                 implodeArr.push_back(std::to_string(val));
@@ -432,8 +441,8 @@ bool Configuration::LoadConfiguration()
     if (loggingMode != "daily" && loggingMode != "map" && loggingMode != "permanent")
         return ConfigurationError("core.json", "The field \"logging.mode\" needs to be: \"daily\" or \"map\".");
 
-    RegisterConfigurationVector<std::string>(wasEdited, coreConfigFile, "core", "core", "commandPrefixes", {"!"}, true, " ");
-    RegisterConfigurationVector<std::string>(wasEdited, coreConfigFile, "core", "core", "commandSilentPrefixes", {"/"}, true, " ");
+    RegisterConfigurationVector<std::string>(wasEdited, coreConfigFile, "core", "core", "commandPrefixes", { "!" }, true, " ");
+    RegisterConfigurationVector<std::string>(wasEdited, coreConfigFile, "core", "core", "commandSilentPrefixes", { "/" }, true, " ");
     RegisterConfigurationVector<std::string>(wasEdited, coreConfigFile, "core", "core", "patches_to_perform", {}, true, " ");
 
     RegisterConfiguration(wasEdited, coreConfigFile, "core", "core", "CS2ServerGuidelines", "https://blog.counter-strike.net/index.php/server_guidelines/");
@@ -461,9 +470,9 @@ bool Configuration::LoadConfiguration()
     return true;
 }
 
-void LoadConfigPart(std::string key, rapidjson::Value &document);
+void LoadConfigPart(std::string key, rapidjson::Value& document);
 
-void LoadValue(const char *key, const char *keyname, rapidjson::Value &value, std::string separator = ".")
+void LoadValue(const char* key, const char* keyname, rapidjson::Value& value, std::string separator = ".")
 {
     std::string k = key + separator + keyname;
     if (value.IsBool())
@@ -484,10 +493,13 @@ void LoadValue(const char *key, const char *keyname, rapidjson::Value &value, st
         g_Config->SetValue(k, value.GetUint());
     else if (value.IsNull())
         g_Config->SetValue(k, nullptr);
-    else if (value.IsObject())
+    else if (value.IsObject()) {
+        g_Config->SetValue(k, string_format("<%s>", JSONToString(value).c_str()));
         LoadConfigPart(k, value);
+    }
     else if (value.IsArray())
     {
+        g_Config->SetValue(k, string_format("JSON<%s>", JSONToString(value).c_str()));
         g_Config->SetArraySize(k, value.Size());
         for (size_t i = 0; i < value.Size(); i++)
         {
@@ -497,7 +509,7 @@ void LoadValue(const char *key, const char *keyname, rapidjson::Value &value, st
     }
 };
 
-void LoadConfigPart(std::string key, rapidjson::Value &document)
+void LoadConfigPart(std::string key, rapidjson::Value& document)
 {
     for (auto it = document.MemberBegin(); it != document.MemberEnd(); ++it)
     {
@@ -538,9 +550,9 @@ void Configuration::LoadPluginConfigurations()
         }
 
         std::string main_key = explode(configFileName, ".json")[0];
-        rapidjson::Value &root = configurationFile;
+        rapidjson::Value& root = configurationFile;
 
-        g_Config->SetValue(main_key, true);
+        g_Config->SetValue(main_key, JSONToString(root));
         LoadConfigPart(main_key, root);
     }
 }
@@ -582,9 +594,9 @@ void Configuration::LoadPluginConfig(std::string key)
     configFileName = replace(configFileName, "\\", ".");
     std::string main_key = explode(configFileName, ".json")[0];
 
-    rapidjson::Value &root = configurationFile;
+    rapidjson::Value& root = configurationFile;
 
-    g_Config->SetValue(main_key, true);
+    g_Config->SetValue(main_key, JSONToString(root));
     LoadConfigPart(main_key, root);
 }
 
diff --git a/src/configuration/Configuration.h b/src/configuration/Configuration.h
@@ -8,6 +8,7 @@
 #include <rapidjson/document.h>
 #include <rapidjson/error/en.h>
 #include <rapidjson/prettywriter.h>
+#include <rapidjson/writer.h>
 #include <rapidjson/stringbuffer.h>
 
 class Configuration
@@ -38,7 +39,7 @@ class Configuration
     void LoadPluginConfig(std::string key);
 };
 
-extern Configuration *g_Config;
+extern Configuration* g_Config;
 
 template <typename T>
 T Configuration::FetchValue(std::string key)
@@ -49,6 +50,6 @@ T Configuration::FetchValue(std::string key)
     return std::any_cast<T>(this->config.at(key));
 }
 
-void WritePluginFile(std::string path, rapidjson::Value &val);
+void WritePluginFile(std::string path, rapidjson::Value& val);
 
 #endif
diff --git a/src/plugins/lua/LuaPlugin.cpp b/src/plugins/lua/LuaPlugin.cpp

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ bool ConfigurationError(std::string configuration_file, std::string error)`
`12`	`12`	`return false;`
`13`	`13`	`}`
`14`	`14`
`15`		`-void WritePluginFile(std::string path, rapidjson::Value &val)`
	`15`	`+void WritePluginFile(std::string path, rapidjson::Value& val)`
`16`	`16`	`{`
`17`	`17`	`rapidjson::StringBuffer buffer;`
`18`	`18`	`rapidjson::PrettyWriter<rapidjson::StringBuffer> writer(buffer);`
`@@ -23,9 +23,18 @@ void WritePluginFile(std::string path, rapidjson::Value &val)`
`23`	`23`	`Files::Write(path, content, false);`
`24`	`24`	`}`
`25`	`25`
`26`		`-rapidjson::Value &GetJSONDoc(rapidjson::Document &doc, std::string key, rapidjson::Value &defaultValue, bool &wasCreated)`
	`26`	`+std::string JSONToString(rapidjson::Value& val)`
`27`	`27`	`{`
`28`		`- rapidjson::Value *currentDoc = &doc;`
	`28`	`+ rapidjson::StringBuffer buffer;`
	`29`	`+ rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);`
	`30`	`+`
	`31`	`+ val.Accept(writer);`
	`32`	`+ return buffer.GetString();`
	`33`	`+}`
	`34`	`+`
	`35`	`+rapidjson::Value& GetJSONDoc(rapidjson::Document& doc, std::string key, rapidjson::Value& defaultValue, bool& wasCreated)`
	`36`	`+{`
	`37`	`+ rapidjson::Value* currentDoc = &doc;`
`29`	`38`	`auto keys = explode(key, ".");`
`30`	`39`
`31`	`40`	`while (keys.size() > 1)`
`@@ -51,13 +60,13 @@ rapidjson::Value &GetJSONDoc(rapidjson::Document &doc, std::string key, rapidjso`
`51`	`60`	`}`
`52`	`61`
`53`	`62`	`template <class T>`
`54`		`-void RegisterConfiguration(bool &wasCreated, rapidjson::Document &document, std::string configFilePath, std::string config_prefix, std::string key, T default_value)`
	`63`	`+void RegisterConfiguration(bool& wasCreated, rapidjson::Document& document, std::string configFilePath, std::string config_prefix, std::string key, T default_value)`
`55`	`64`	`{`
`56`	`65`	`rapidjson::Value defaultValue;`
`57`	`66`
`58`	`67`	`if constexpr (std::is_same<T, std::string>::value)`
`59`	`68`	`defaultValue.SetString(default_value.c_str(), document.GetAllocator());`
`60`		`- else if constexpr (std::is_same<T, const char *>::value)`
	`69`	`+ else if constexpr (std::is_same<T, const char*>::value)`
`61`	`70`	`defaultValue.SetString(default_value, document.GetAllocator());`
`62`	`71`	`else if constexpr (std::is_same<T, bool>::value)`
`63`	`72`	`defaultValue.SetBool(default_value);`
`@@ -82,7 +91,7 @@ void RegisterConfiguration(bool &wasCreated, rapidjson::Document &document, std:`
`82`	`91`	`else if constexpr (std::is_same<T, double>::value)`
`83`	`92`	`defaultValue.SetDouble(default_value);`
`84`	`93`
`85`		`- rapidjson::Value &jsonDoc = GetJSONDoc(document, key, defaultValue, wasCreated);`
	`94`	`+ rapidjson::Value& jsonDoc = GetJSONDoc(document, key, defaultValue, wasCreated);`
`86`	`95`
`87`	`96`	`if constexpr (std::is_same<T, std::string>::value)`
`88`	`97`	`{`
`@@ -94,7 +103,7 @@ void RegisterConfiguration(bool &wasCreated, rapidjson::Document &document, std:`
`94`	`103`
`95`	`104`	`g_Config->SetValue(config_prefix + "." + key, std::string(jsonDoc.GetString()));`
`96`	`105`	`}`
`97`		`- else if constexpr (std::is_same<T, const char *>::value)`
	`106`	`+ else if constexpr (std::is_same<T, const char*>::value)`
`98`	`107`	`{`
`99`	`108`	`if (!jsonDoc.IsString())`
`100`	`109`	`{`
`@@ -216,17 +225,17 @@ void RegisterConfiguration(bool &wasCreated, rapidjson::Document &document, std:`
`216`	`225`	`}`
`217`	`226`
`218`	`227`	`template <class T>`
`219`		`-void RegisterConfigurationVector(bool &wasCreated, rapidjson::Document &document, std::string configFilePath, std::string config_prefix, std::string key, std::vector<T> default_value, bool shouldImplode, std::string delimiter)`
	`228`	`+void RegisterConfigurationVector(bool& wasCreated, rapidjson::Document& document, std::string configFilePath, std::string config_prefix, std::string key, std::vector<T> default_value, bool shouldImplode, std::string delimiter)`
`220`	`229`	`{`
`221`	`230`	`rapidjson::Value defaultValue(rapidjson::kArrayType);`
`222`	`231`
`223`		`- for (const T &val : default_value)`
	`232`	`+ for (const T& val : default_value)`
`224`	`233`	`{`
`225`	`234`	`rapidjson::Value defVal;`
`226`	`235`
`227`	`236`	`if constexpr (std::is_same<T, std::string>::value)`
`228`	`237`	`defVal.SetString(val.c_str(), document.GetAllocator());`
`229`		`- else if constexpr (std::is_same<T, const char *>::value)`
	`238`	`+ else if constexpr (std::is_same<T, const char*>::value)`
`230`	`239`	`defVal.SetString(val, document.GetAllocator());`
`231`	`240`	`else if constexpr (std::is_same<T, bool>::value)`
`232`	`241`	`defVal.SetBool(val);`
`@@ -254,7 +263,7 @@ void RegisterConfigurationVector(bool &wasCreated, rapidjson::Document &document`
`254`	`263`	`defaultValue.PushBack(defVal, document.GetAllocator());`
`255`	`264`	`}`
`256`	`265`
`257`		`- rapidjson::Value &jsonDoc = GetJSONDoc(document, key, defaultValue, wasCreated);`
	`266`	`+ rapidjson::Value& jsonDoc = GetJSONDoc(document, key, defaultValue, wasCreated);`
`258`	`267`
`259`	`268`	`if (!jsonDoc.IsArray())`
`260`	`269`	`{`
`@@ -278,7 +287,7 @@ void RegisterConfigurationVector(bool &wasCreated, rapidjson::Document &document`
`278`	`287`
`279`	`288`	`result.push_back(std::string(arr[i].GetString()));`
`280`	`289`	`}`
`281`		`- else if constexpr (std::is_same<T, const char *>::value)`
	`290`	`+ else if constexpr (std::is_same<T, const char*>::value)`
`282`	`291`	`{`
`283`	`292`	`if (!arr[i].IsString())`
`284`	`293`	`{`
`@@ -397,11 +406,11 @@ void RegisterConfigurationVector(bool &wasCreated, rapidjson::Document &document`
`397`	`406`	`if (shouldImplode)`
`398`	`407`	`{`
`399`	`408`	`std::vector<std::string> implodeArr;`
`400`		`- for (const T &val : result)`
	`409`	`+ for (const T& val : result)`
`401`	`410`	`{`
`402`	`411`	`if constexpr (std::is_same<T, std::string>::value)`
`403`	`412`	`implodeArr.push_back(val);`
`404`		`- else if constexpr (std::is_same<T, const char *>::value)`
	`413`	`+ else if constexpr (std::is_same<T, const char*>::value)`
`405`	`414`	`implodeArr.push_back(std::string(val));`
`406`	`415`	`else`
`407`	`416`	`implodeArr.push_back(std::to_string(val));`
`@@ -432,8 +441,8 @@ bool Configuration::LoadConfiguration()`
`432`	`441`	`if (loggingMode != "daily" && loggingMode != "map" && loggingMode != "permanent")`
`433`	`442`	`return ConfigurationError("core.json", "The field \"logging.mode\" needs to be: \"daily\" or \"map\".");`
`434`	`443`
`435`		`- RegisterConfigurationVector<std::string>(wasEdited, coreConfigFile, "core", "core", "commandPrefixes", {"!"}, true, " ");`
`436`		`- RegisterConfigurationVector<std::string>(wasEdited, coreConfigFile, "core", "core", "commandSilentPrefixes", {"/"}, true, " ");`
	`444`	`+ RegisterConfigurationVector<std::string>(wasEdited, coreConfigFile, "core", "core", "commandPrefixes", { "!" }, true, " ");`
	`445`	`+ RegisterConfigurationVector<std::string>(wasEdited, coreConfigFile, "core", "core", "commandSilentPrefixes", { "/" }, true, " ");`
`437`	`446`	`RegisterConfigurationVector<std::string>(wasEdited, coreConfigFile, "core", "core", "patches_to_perform", {}, true, " ");`
`438`	`447`
`439`	`448`	`RegisterConfiguration(wasEdited, coreConfigFile, "core", "core", "CS2ServerGuidelines", "https://blog.counter-strike.net/index.php/server_guidelines/");`
`@@ -461,9 +470,9 @@ bool Configuration::LoadConfiguration()`
`461`	`470`	`return true;`
`462`	`471`	`}`
`463`	`472`
`464`		`-void LoadConfigPart(std::string key, rapidjson::Value &document);`
	`473`	`+void LoadConfigPart(std::string key, rapidjson::Value& document);`
`465`	`474`
`466`		`-void LoadValue(const char key, const char keyname, rapidjson::Value &value, std::string separator = ".")`
	`475`	`+void LoadValue(const char* key, const char* keyname, rapidjson::Value& value, std::string separator = ".")`
`467`	`476`	`{`
`468`	`477`	`std::string k = key + separator + keyname;`
`469`	`478`	`if (value.IsBool())`
`@@ -484,10 +493,13 @@ void LoadValue(const char key, const char keyname, rapidjson::Value &value, st`
`484`	`493`	`g_Config->SetValue(k, value.GetUint());`
`485`	`494`	`else if (value.IsNull())`
`486`	`495`	`g_Config->SetValue(k, nullptr);`
`487`		`- else if (value.IsObject())`
	`496`	`+ else if (value.IsObject()) {`
	`497`	`+ g_Config->SetValue(k, string_format("<%s>", JSONToString(value).c_str()));`
`488`	`498`	`LoadConfigPart(k, value);`
	`499`	`+ }`
`489`	`500`	`else if (value.IsArray())`
`490`	`501`	`{`
	`502`	`+ g_Config->SetValue(k, string_format("JSON<%s>", JSONToString(value).c_str()));`
`491`	`503`	`g_Config->SetArraySize(k, value.Size());`
`492`	`504`	`for (size_t i = 0; i < value.Size(); i++)`
`493`	`505`	`{`
`@@ -497,7 +509,7 @@ void LoadValue(const char key, const char keyname, rapidjson::Value &value, st`
`497`	`509`	`}`
`498`	`510`	`};`
`499`	`511`
`500`		`-void LoadConfigPart(std::string key, rapidjson::Value &document)`
	`512`	`+void LoadConfigPart(std::string key, rapidjson::Value& document)`
`501`	`513`	`{`
`502`	`514`	`for (auto it = document.MemberBegin(); it != document.MemberEnd(); ++it)`
`503`	`515`	`{`
`@@ -538,9 +550,9 @@ void Configuration::LoadPluginConfigurations()`
`538`	`550`	`}`
`539`	`551`
`540`	`552`	`std::string main_key = explode(configFileName, ".json")[0];`
`541`		`- rapidjson::Value &root = configurationFile;`
	`553`	`+ rapidjson::Value& root = configurationFile;`
`542`	`554`
`543`		`- g_Config->SetValue(main_key, true);`
	`555`	`+ g_Config->SetValue(main_key, JSONToString(root));`
`544`	`556`	`LoadConfigPart(main_key, root);`
`545`	`557`	`}`
`546`	`558`	`}`
`@@ -582,9 +594,9 @@ void Configuration::LoadPluginConfig(std::string key)`
`582`	`594`	`configFileName = replace(configFileName, "\\", ".");`
`583`	`595`	`std::string main_key = explode(configFileName, ".json")[0];`
`584`	`596`
`585`		`- rapidjson::Value &root = configurationFile;`
	`597`	`+ rapidjson::Value& root = configurationFile;`
`586`	`598`
`587`		`- g_Config->SetValue(main_key, true);`
	`599`	`+ g_Config->SetValue(main_key, JSONToString(root));`
`588`	`600`	`LoadConfigPart(main_key, root);`
`589`	`601`	`}`
`590`	`602`