Skip to content

Commit

Permalink
Refactor CMainConfig::AddMissingSettings() and edit .conf comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@Fernando-A-Rocha
Fernando-A-Rocha committed Oct 5, 2024
1 parent a938d62 commit be21fa1
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 42 deletions.
6 changes: 2 additions & 4 deletions Server/mods/deathmatch/editor.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
and on Game-Monitor. It is a required parameter. -->
<servername>Map Editor Server</servername>

<!-- These rules are optional parameters for the server browser/list (they can be left empty).
Each rule has their own requirements. Read carefully. -->

<!-- A brief description of the server. -->
<!-- The rule parameters are optional settings that the server will make public for the server browser/list.
A brief description of the server. -->
<rule name="description" value="" />

<!-- A comma separated list of languages that the server supports (e.g. en). -->
Expand Down
6 changes: 2 additions & 4 deletions Server/mods/deathmatch/local.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
and on Game-Monitor. It is a required parameter. -->
<servername>Default MTA Server</servername>

<!-- These rules are optional parameters for the server browser/list (they can be left empty).
Each rule has their own requirements. Read carefully. -->

<!-- A brief description of the server. -->
<!-- The rule parameters are optional settings that the server will make public for the server browser/list.
A brief description of the server. -->
<rule name="description" value="" />

<!-- A comma separated list of languages that the server supports (e.g. en). -->
Expand Down
95 changes: 69 additions & 26 deletions Server/mods/deathmatch/logic/CMainConfig.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ bool CMainConfig::Load()

// Find bitnumber
bool found = false;
for (uint i = 0; i < NUMELMS(gtaDataFiles); i++)
for (std::uint8_t i = 0; i < NUMELMS(gtaDataFiles); i++)
{
if (name == gtaDataFiles[i].szRealFilename)
{
Expand Down Expand Up @@ -856,44 +856,87 @@ bool CMainConfig::AddMissingSettings()
if (!g_pGame->IsUsingMtaServerConf())
return false;

SString strTemplateFilename = PathJoin(g_pServerInterface->GetServerModPath(), "mtaserver.conf.template");
const SString& templateFileName = PathJoin(g_pServerInterface->GetServerModPath(), "mtaserver.conf.template");

if (!FileExists(strTemplateFilename))
if (!FileExists(templateFileName))
return false;

CXMLFile* pFileTemplate = g_pServerInterface->GetXML()->CreateXML(strTemplateFilename);
CXMLNode* pRootNodeTemplate = pFileTemplate && pFileTemplate->Parse() ? pFileTemplate->GetRootNode() : nullptr;
if (!pRootNodeTemplate)
CXMLFile* templateFile = g_pServerInterface->GetXML()->CreateXML(templateFileName);
CXMLNode* templateRootNode = templateFile && templateFile->Parse() ? templateFile->GetRootNode() : nullptr;
if (!templateRootNode)
{
CLogger::ErrorPrintf("Can't parse '%s'\n", *strTemplateFilename);
CLogger::ErrorPrintf("Can't parse '%s'\n", *templateFileName);
return false;
}

// Check that each item in the template also exists in the server config
bool bChanged = false;
CXMLNode* pPrevNode = nullptr;
for (auto it = pRootNodeTemplate->ChildrenBegin(); it != pRootNodeTemplate->ChildrenEnd(); ++it)
{
CXMLNode* pNodeTemplate = *it;
SString strNodeName = pNodeTemplate->GetTagName();
CXMLNode* pNode = m_pRootNode->FindSubNode(strNodeName);
if (!pNode)
bool hasConfigChanged = false;
CXMLNode* previousNode = nullptr;
for (auto it = templateRootNode->ChildrenBegin(); it != templateRootNode->ChildrenEnd(); ++it)
{
CXMLNode* templateNode = *it;
SString templateNodeTagName = templateNode->GetTagName();

// Find node with exact same attributes
CXMLAttributes& templateAttributes = templateNode->GetAttributes();
CXMLNode* foundNode = nullptr;
for (auto it2 = m_pRootNode->ChildrenBegin(); it2 != m_pRootNode->ChildrenEnd(); ++it2)
{
CLogger::LogPrintf("Adding missing '%s' to mtaserver.conf\n", *strNodeName);
SString strNodeValue = pNodeTemplate->GetTagContent();
SString strNodeComment = pNodeTemplate->GetCommentText();
pNode = m_pRootNode->CreateSubNode(strNodeName, pPrevNode);
pNode->SetTagContent(strNodeValue);
pNode->SetCommentText(strNodeComment, true);
bChanged = true;
CXMLNode* tempNode = *it2;
if (tempNode->GetTagName() == templateNodeTagName)
{
bool bAttributesMatch = true;
CXMLAttributes& attributes = tempNode->GetAttributes();
for (auto it3 = templateAttributes.ListBegin(); it3 != templateAttributes.ListEnd(); ++it3)
{
CXMLAttribute* templateAttribute = *it3;
const SString& strKey = templateAttribute->GetName();
const SString& strValue = templateAttribute->GetValue();
CXMLAttribute* foundAttribute = attributes.Find(strKey);
if (!foundAttribute || foundAttribute->GetValue() != strValue)
{
bAttributesMatch = false;
break;
}
}
if (bAttributesMatch)
{
foundNode = tempNode;
break;
}
}
}
// Create missing node if not found
if (!foundNode)
{
CLogger::LogPrintf("Adding missing '%s' to mtaserver.conf\n", *templateNodeTagName);
SString value = templateNode->GetTagContent();
SString commentText = templateNode->GetCommentText();
foundNode = m_pRootNode->CreateSubNode(templateNodeTagName, previousNode);
foundNode->SetTagContent(value);
foundNode->SetCommentText(commentText, true);

// Copy attributes from template node
CXMLAttributes& templateAttributes = templateNode->GetAttributes();
for (auto it = templateAttributes.ListBegin(); it != templateAttributes.ListEnd(); ++it)
{
CXMLAttribute* templateAttribute = *it;
const SString& attributeName = templateAttribute->GetName();
const SString& attributeValue = templateAttribute->GetValue();

CXMLAttribute* newAttribute = foundNode->GetAttributes().Create(attributeName);
if (newAttribute)
newAttribute->SetValue(attributeValue);
}
hasConfigChanged = true;
}
pPrevNode = pNode;
previousNode = foundNode;
}

// Clean up
g_pServerInterface->GetXML()->DeleteXML(pFileTemplate);
FileDelete(strTemplateFilename);
return bChanged;
g_pServerInterface->GetXML()->DeleteXML(templateFile);
FileDelete(templateFileName);
return hasConfigChanged;
}

bool CMainConfig::IsValidPassword(const char* szPassword)
Expand Down
6 changes: 2 additions & 4 deletions Server/mods/deathmatch/mtaserver.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
and on Game-Monitor. It is a required parameter. -->
<servername>Default MTA Server</servername>

<!-- These rules are optional parameters for the server browser/list (they can be left empty).
Each rule has their own requirements. Read carefully. -->

<!-- A brief description of the server. -->
<!-- The rule parameters are optional settings that the server will make public for the server browser/list.
A brief description of the server. -->
<rule name="description" value="" />

<!-- A comma separated list of languages that the server supports (e.g. en). -->
Expand Down
6 changes: 2 additions & 4 deletions Server/mods/deathmatch/mtaserver.conf.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
and on Game-Monitor. It is a required parameter. -->
<servername>Default MTA Server</servername>

<!-- These rules are optional parameters for the server browser/list (they can be left empty).
Each rule has their own requirements. Read carefully. -->

<!-- A brief description of the server. -->
<!-- The rule parameters are optional settings that the server will make public for the server browser/list.
A brief description of the server. -->
<rule name="description" value="" />

<!-- A comma separated list of languages that the server supports (e.g. en). -->
Expand Down

0 comments on commit be21fa1

Please sign in to comment.