mirror of
https://github.com/BeamMP/BeamMP-Server.git
synced 2026-02-16 10:41:01 +00:00
remove dead code
This commit is contained in:
Lion Kortlepel
274
src/TConfig.cpp
274
src/TConfig.cpp
@@ -28,61 +28,6 @@ TConfig::TConfig() {
|
||||
}
|
||||
ParseFromFile(ConfigFileName);
|
||||
}
|
||||
/*if (!fs::exists("Server.cfg")) {
|
||||
info("Config not found generating default");
|
||||
ManageJson();
|
||||
error("AuthKey cannot be empty check Config.json!");
|
||||
std::this_thread::sleep_for(std::chrono::seconds(3));
|
||||
Application::GracefullyShutdown();
|
||||
return;
|
||||
}
|
||||
|
||||
std::ifstream File(ConfigFile);
|
||||
if (File.good()) {
|
||||
std::string line;
|
||||
int index = 1;
|
||||
while (getline(File, line)) {
|
||||
index++;
|
||||
}
|
||||
if (index - 1 < 11) {
|
||||
error("Outdated/Incorrect config please remove it server will close in 5 secs");
|
||||
std::this_thread::sleep_for(std::chrono::seconds(3));
|
||||
_Exit(0);
|
||||
}
|
||||
File.close();
|
||||
File.open("Server.cfg");
|
||||
info("Old Config found updating values");
|
||||
index = 1;
|
||||
while (std::getline(File, line)) {
|
||||
if (line.rfind('#', 0) != 0 && line.rfind(' ', 0) != 0) { //Checks if it starts as Comment
|
||||
std::string CleanLine = RemoveComments(line); //Cleans it from the Comments
|
||||
SetValues(CleanLine, index); //sets the values
|
||||
index++;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
info("Config not found generating default");
|
||||
std::ofstream FileStream;
|
||||
FileStream.open(ConfigFile);
|
||||
// TODO REPLACE THIS SHIT OMG -- replacing
|
||||
FileStream << "# This is the BeamMP Server Configuration File v0.60\n"
|
||||
"Debug = false # true or false to enable debug console output\n"
|
||||
"Private = true # Private?\n"
|
||||
"Port = 30814 # Port to run the server on UDP and TCP\n"
|
||||
"Cars = 1 # Max cars for every player\n"
|
||||
"MaxPlayers = 10 # Maximum Amount of Clients\n"
|
||||
"Map = \"/levels/gridmap/info.json\" # Default Map\n"
|
||||
"Name = \"BeamMP New Server\" # Server Name\n"
|
||||
"Desc = \"BeamMP Default Description\" # Server Description\n"
|
||||
"use = \"Resources\" # Resource file name\n"
|
||||
"AuthKey = \"\" # Auth Key";
|
||||
FileStream.close();
|
||||
error("You are required to input the AuthKey");
|
||||
std::this_thread::sleep_for(std::chrono::seconds(3));
|
||||
_Exit(0);
|
||||
}
|
||||
|
||||
*/
|
||||
}
|
||||
|
||||
void TConfig::CreateConfigFile(std::string_view name) {
|
||||
@@ -187,225 +132,6 @@ void TConfig::ParseFromFile(std::string_view name) {
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
void TConfig::ReadJson() {
|
||||
auto Size = fs::file_size("Config.json");
|
||||
if (Size < 3)
|
||||
return;
|
||||
|
||||
std::ifstream ifs("Config.json");
|
||||
if (ifs.is_open()) {
|
||||
std::string cfg(Size, 0);
|
||||
ifs.read(&cfg[0], long(Size));
|
||||
ifs.close();
|
||||
|
||||
if (auto pos = cfg.find('{'); pos != std::string::npos) {
|
||||
if (cfg.at(0) != '{') {
|
||||
cfg = cfg.substr(pos);
|
||||
}
|
||||
} else {
|
||||
error("Config file is not valid JSON!");
|
||||
std::this_thread::sleep_for(std::chrono::seconds(3));
|
||||
Application::GracefullyShutdown();
|
||||
}
|
||||
|
||||
rapidjson::Document d;
|
||||
d.Parse(cfg.c_str());
|
||||
if (!d.HasParseError()) {
|
||||
auto& Val = d["Debug"];
|
||||
if (!Val.IsNull() && Val.IsBool()) {
|
||||
Application::Settings.DebugModeEnabled = Val.GetBool();
|
||||
} else {
|
||||
info("'Debug' Missing in config! Setting to 'false' by default");
|
||||
}
|
||||
|
||||
Val = d["Private"];
|
||||
|
||||
if (!Val.IsNull() && Val.IsBool()) {
|
||||
Application::Settings.Private = Val.GetBool();
|
||||
} else {
|
||||
info("'Private' Missing in config! Setting to 'true' by default");
|
||||
}
|
||||
|
||||
Val = d["Port"];
|
||||
|
||||
if (!Val.IsNull() && Val.IsNumber()) {
|
||||
Application::Settings.Port = Val.GetInt();
|
||||
} else {
|
||||
info("'Port' Missing in config! Setting to '30814' by default");
|
||||
}
|
||||
|
||||
Val = d["MaxCars"];
|
||||
|
||||
if (!Val.IsNull() && Val.IsNumber()) {
|
||||
Application::Settings.MaxCars = Val.GetInt();
|
||||
} else {
|
||||
info("'MaxCars' Missing in config! Setting to '1' by default");
|
||||
}
|
||||
|
||||
Val = d["MaxPlayers"];
|
||||
|
||||
if (!Val.IsNull() && Val.IsNumber()) {
|
||||
Application::Settings.MaxPlayers = Val.GetInt();
|
||||
} else {
|
||||
info("'MaxPlayers' Missing in config! Setting to '10' by default");
|
||||
}
|
||||
|
||||
Val = d["Map"];
|
||||
|
||||
if (!Val.IsNull() && Val.IsString()) {
|
||||
Application::Settings.MapName = Val.GetString();
|
||||
} else {
|
||||
info("'Map' Missing in config! Setting to '/levels/gridmap/info.json' by default");
|
||||
}
|
||||
|
||||
Val = d["Name"];
|
||||
|
||||
if (!Val.IsNull() && Val.IsString()) {
|
||||
Application::Settings.ServerName = Val.GetString();
|
||||
} else {
|
||||
info("'Name' Missing in config! Setting to 'BeamMP Server' by default");
|
||||
}
|
||||
|
||||
Val = d["Desc"];
|
||||
|
||||
if (!Val.IsNull() && Val.IsString()) {
|
||||
Application::Settings.ServerDesc = Val.GetString();
|
||||
} else {
|
||||
info("'Desc' Missing in config! Setting to 'BeamMP Default Description' by default");
|
||||
}
|
||||
|
||||
Val = d["Resource"];
|
||||
|
||||
if (!Val.IsNull() && Val.IsString()) {
|
||||
Application::Settings.Resource = Val.GetString();
|
||||
} else {
|
||||
info("'Resource' Missing in config! Setting to 'Resources' by default");
|
||||
}
|
||||
|
||||
Val = d["AuthKey"];
|
||||
|
||||
if (!Val.IsNull() && Val.IsString()) {
|
||||
Application::Settings.Key = Val.GetString();
|
||||
if (Application::Settings.Key.empty()) {
|
||||
error("AuthKey cannot be empty check Config.json!");
|
||||
std::this_thread::sleep_for(std::chrono::seconds(3));
|
||||
Application::GracefullyShutdown();
|
||||
}
|
||||
} else {
|
||||
error("'AuthKey' Missing in config!");
|
||||
std::this_thread::sleep_for(std::chrono::seconds(3));
|
||||
Application::GracefullyShutdown();
|
||||
}
|
||||
|
||||
} else {
|
||||
error("Failed to parse JSON config! code " + std::to_string(d.GetParseError()));
|
||||
}
|
||||
} else {
|
||||
error("Failed to read Config.json");
|
||||
std::this_thread::sleep_for(std::chrono::seconds(3));
|
||||
Application::GracefullyShutdown();
|
||||
}
|
||||
PrintDebug();
|
||||
}
|
||||
|
||||
void TConfig::ManageJson() {
|
||||
rapidjson::Document d;
|
||||
d.Parse("{}");
|
||||
d.AddMember("Debug", Application::Settings.DebugModeEnabled, d.GetAllocator());
|
||||
d.AddMember("Private", Application::Settings.Private, d.GetAllocator());
|
||||
d.AddMember("Port", Application::Settings.Port, d.GetAllocator());
|
||||
d.AddMember("MaxCars", Application::Settings.MaxCars, d.GetAllocator());
|
||||
d.AddMember("MaxPlayers", Application::Settings.MaxPlayers, d.GetAllocator());
|
||||
d.AddMember("Map", rapidjson::StringRef(Application::Settings.MapName.c_str()), d.GetAllocator());
|
||||
d.AddMember("Name", rapidjson::StringRef(Application::Settings.ServerName.c_str()), d.GetAllocator());
|
||||
d.AddMember("Desc", rapidjson::StringRef(Application::Settings.ServerDesc.c_str()), d.GetAllocator());
|
||||
d.AddMember("Resource", rapidjson::StringRef(Application::Settings.Resource.c_str()), d.GetAllocator());
|
||||
d.AddMember("AuthKey", rapidjson::StringRef(Application::Settings.Key.c_str()), d.GetAllocator());
|
||||
|
||||
rapidjson::StringBuffer buffer;
|
||||
rapidjson::PrettyWriter<rapidjson::StringBuffer> writer(buffer);
|
||||
d.Accept(writer);
|
||||
|
||||
std::ofstream cfg;
|
||||
cfg.open("Config.json");
|
||||
if (cfg.is_open()) {
|
||||
cfg << "BeamMP Server Configuration File\n"
|
||||
<< buffer.GetString();
|
||||
cfg.close();
|
||||
} else {
|
||||
error("Failed to create Config.json!");
|
||||
}
|
||||
}
|
||||
|
||||
std::string TConfig::RemoveComments(const std::string& Line) {
|
||||
std::string Return;
|
||||
for (char c : Line) {
|
||||
if (c == '#')
|
||||
break;
|
||||
Return += c;
|
||||
}
|
||||
return Return;
|
||||
}
|
||||
|
||||
void TConfig::SetValues(const std::string& Line, int Index) {
|
||||
int state = 0;
|
||||
std::string Data;
|
||||
bool Switch = false;
|
||||
if (Index > 5)
|
||||
Switch = true;
|
||||
for (char c : Line) {
|
||||
if (Switch) {
|
||||
if (c == '\"')
|
||||
state++;
|
||||
if (state > 0 && state < 2)
|
||||
Data += c;
|
||||
} else {
|
||||
if (c == ' ')
|
||||
state++;
|
||||
if (state > 1)
|
||||
Data += c;
|
||||
}
|
||||
}
|
||||
Data = Data.substr(1);
|
||||
std::string::size_type sz;
|
||||
bool FoundTrue = std::string(Data).find("true") != std::string::npos; //searches for "true"
|
||||
switch (Index) {
|
||||
case 1:
|
||||
Application::Settings.DebugModeEnabled = FoundTrue; //checks and sets the Debug Value
|
||||
break;
|
||||
case 2:
|
||||
Application::Settings.Private = FoundTrue; //checks and sets the Private Value
|
||||
break;
|
||||
case 3:
|
||||
Application::Settings.Port = std::stoi(Data, &sz); //sets the Port
|
||||
break;
|
||||
case 4:
|
||||
Application::Settings.MaxCars = std::stoi(Data, &sz); //sets the Max Car amount
|
||||
break;
|
||||
case 5:
|
||||
Application::Settings.MaxPlayers = std::stoi(Data, &sz); //sets the Max Amount of player
|
||||
break;
|
||||
case 6:
|
||||
Application::Settings.MapName = Data; //Map
|
||||
break;
|
||||
case 7:
|
||||
Application::Settings.ServerName = Data; //Name
|
||||
break;
|
||||
case 8:
|
||||
Application::Settings.ServerDesc = Data; //desc
|
||||
break;
|
||||
case 9:
|
||||
Application::Settings.Resource = Data; //File name
|
||||
break;
|
||||
case 10:
|
||||
Application::Settings.Key = Data; //File name
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
*/
|
||||
void TConfig::PrintDebug() {
|
||||
debug(std::string(StrDebug) + ": " + std::string(Application::Settings.DebugModeEnabled ? "true" : "false"));
|
||||
debug(std::string(StrPrivate) + ": " + std::string(Application::Settings.Private ? "true" : "false"));
|
||||
|
||||
Reference in New Issue
Block a user