dont remove the template

Fernando-A-Rocha · Nov 15, 2024 · f0195c7 · f0195c7
1 parent ce676de
commit f0195c7
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 4 deletions.
diff --git a/Server/mods/deathmatch/logic/CMainConfig.cpp b/Server/mods/deathmatch/logic/CMainConfig.cpp
@@ -22,6 +22,8 @@
 #include "CHTTPD.h"
 #include "CStaticFunctionDefinitions.h"
 
+#define MTA_SERVER_CONF_TEMPLATE "mtaserver.conf.template"
+
 extern CGame* g_pGame;
 
 CBandwidthSettings* g_pBandwidthSettings = new CBandwidthSettings();
@@ -114,6 +116,11 @@ bool CMainConfig::Load()
         return false;
     }
 
+    if (AddMissingSettings())
+    {
+        Save();
+    }
+
     // Name
     int iResult = GetString(m_pRootNode, "servername", m_strServerName, 1, 96);
     if (iResult == DOESNT_EXIST)
@@ -836,6 +843,57 @@ bool CMainConfig::Save()
     return false;
 }
 
+//
+// Compare against default config and add missing nodes.
+// Returns true if nodes were added.
+//
+bool CMainConfig::AddMissingSettings()
+{
+    // Only mtaserver.conf is currently supported
+    if (!g_pGame->IsUsingMtaServerConf())
+        return false;
+
+    SString templateFileName = PathJoin(g_pServerInterface->GetServerModPath(), MTA_SERVER_CONF_TEMPLATE);
+    if (!FileExists(templateFileName))
+        return false;
+
+    CXMLFile* templateFile = g_pServerInterface->GetXML()->CreateXML(templateFileName);
+    CXMLNode* templateRootNode = templateFile && templateFile->Parse() ? templateFile->GetRootNode() : nullptr;
+    if (!templateRootNode)
+    {
+        CLogger::ErrorPrintf("Can't parse '%s'\n", *templateFileName);
+        return false;
+    }
+
+    // Check that each item in the template also exists in the server config
+    bool      configChanged = false;
+    CXMLNode* previousNode = nullptr;
+    for (auto it = templateRootNode->ChildrenBegin(); it != templateRootNode->ChildrenEnd(); ++it)
+    {
+        CXMLNode* templateNode = *it;
+        SString   templateNodeName = templateNode->GetTagName();
+
+        // Skip certain optional nodes
+        if (templateNodeName == "resource" || templateNodeName == "module")
+            continue;
+
+        CXMLNode* foundNode = m_pRootNode->FindSubNode(templateNodeName);
+        if (!foundNode)
+        {
+            SString templateNodeValue = templateNode->GetTagContent();
+            SString templateNodeComment = templateNode->GetCommentText();
+            foundNode = m_pRootNode->CreateSubNode(templateNodeName, previousNode);
+            foundNode->SetTagContent(templateNodeValue);
+            foundNode->SetCommentText(templateNodeComment, true);
+            CLogger::LogPrintf("[%s] Added missing '%s' setting to mtaserver.conf\n", MTA_SERVER_CONF_TEMPLATE, *templateNodeName);
+            configChanged = true;
+        }
+        previousNode = foundNode;
+    }
+    g_pServerInterface->GetXML()->DeleteXML(templateFile);
+    return configChanged;
+}
+
 bool CMainConfig::IsValidPassword(const char* szPassword)
 {
     if (!szPassword)

diff --git a/Server/mods/deathmatch/logic/CMainConfig.h b/Server/mods/deathmatch/logic/CMainConfig.h
@@ -152,6 +152,7 @@ class CMainConfig : public CXMLConfig
 private:
     void RegisterCommand(const char* szName, FCommandHandler* pFunction, bool bRestricted, const char* szConsoleHelpText);
     bool GetSettingTable(const SString& strName, const char** szAttribNames, uint uiNumAttribNames, CLuaArguments* outTable);
+    bool AddMissingSettings();
 
     CConsole*           m_pConsole;
     CXMLNode*           m_pRootNode;

diff --git a/utils/buildactions/compose_files.lua b/utils/buildactions/compose_files.lua
@@ -11,10 +11,10 @@ local WINDOWS = os.host() == "windows"
 newaction {
 	trigger = "compose_files",
 	description = "Composes files that are required for building the installer",
-
+	
 	execute = function()
 		os.mkdir(OUTPUT_DIR)
-
+		
 		-- Copy data files
 		if WINDOWS then
 			os.copydir(DATA_DIR.."/MTA", OUTPUT_DIR.."/MTA")
@@ -25,8 +25,9 @@ newaction {
 
 		-- Copy configs
 		os.copydir("Server/mods/deathmatch", OUTPUT_DIR.."/server/mods/deathmatch", "*.conf")
+		os.copydir("Server/mods/deathmatch", OUTPUT_DIR.."/server/mods/deathmatch", "mtaserver.conf.template")
 		os.copydir("Server/mods/deathmatch", OUTPUT_DIR.."/server/mods/deathmatch", "*.xml")
-
+		
 		-- Copy compiled binaries
 		if WINDOWS then
 			os.copydir(BIN_DIR, OUTPUT_DIR, "**.exe")

diff --git a/utils/buildactions/install_data.lua b/utils/buildactions/install_data.lua
@@ -49,6 +49,12 @@ newaction {
 			return
 		end
 
+		if not os.copyfile(BIN_DIR.."/server/mods/deathmatch/mtaserver.conf", BIN_DIR.."/server/mods/deathmatch/mtaserver.conf.template") then
+			errormsg("ERROR: Could not copy mtaserver.conf to mtaserver.conf.template")
+			os.exit(1)
+			return
+		end
+
 		local success, message = os.copydir("Server/mods/deathmatch", BIN_DIR.."/server/mods/deathmatch", "*.xml", false, true)
 		if not success then
 			errormsg("ERROR: Couldn't copy server xml files", "\n"..message)
@@ -69,7 +75,7 @@ newaction {
 			success = success and http.download_print_errors(NET_PATH_X64_WIN, BIN_DIR.."/server/x64/net.dll")
 			success = success and http.download_print_errors(NET_PATH_ARM64_WIN, BIN_DIR.."/server/arm64/net.dll")
 			success = success and http.download_print_errors(NETC_PATH_WIN, BIN_DIR.."/MTA/netc.dll")
-
+			
 			-- A download failed
 			if not success then
 				os.exit(1)