Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move more config logic into config_manager.cpp

Browse Source
This commit is contained in:
scatterflower 2020-08-23 14:28:16 -05:00
parent 04ae43d960
commit ce46fa1657
3 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/config_manager.h
View File

@ -15,6 +15,8 @@ public:
void generateDefaultConfig(bool backup_old); void generateDefaultConfig(bool backup_old);
void updateConfig(int current_version); void updateConfig(int current_version);
bool loadAdvertiserSettings(QString* ms_ip, int* port, int* ws_port, int* local_port, QString* name, QString* description, bool* advertise_server);
private: private:
QSettings* config; QSettings* config;
}; };

23
src/akashimain.cpp
View File

@ -16,23 +16,12 @@ AkashiMain::AkashiMain(QWidget *parent)
// TODO: send signal server starting // TODO: send signal server starting
// Validate some of the config before passing it on // Validate some of the config before passing it on
// TODO: Move this logic into config_manager.cpp QString ms_ip, name, description;
bool port_conversion_success; int port, ws_port, local_port;
bool ws_port_conversion_success; bool advertise_server;
bool local_port_conversion_success; config_manager.loadAdvertiserSettings(&ms_ip, &port, &ws_port, &local_port, &name, &description, &advertise_server);
config.beginGroup("Options");
QString ms_ip = config.value("ms_ip", "master.aceattorneyonline.com").toString(); if(advertise_server){
int port = config.value("ms_port", "27016").toInt(&port_conversion_success);
int ws_port = config.value("webao_port", "27017").toInt(&ws_port_conversion_success);
int local_port = config.value("port", "27016").toInt(&local_port_conversion_success);
QString name = config.value("server_name", "My First Server").toString();
QString description = config.value("server_description", "This is my flashy new server").toString();
config.endGroup();
if(!port_conversion_success || !ws_port_conversion_success || !local_port_conversion_success) {
// TODO: send signal invalid conf due to bad port number
} else {
if(config.value("advertise", "true").toString() != "true")
ws_port = -1;
advertiser = new Advertiser(ms_ip, port, ws_port, local_port, name, description); advertiser = new Advertiser(ms_ip, port, ws_port, local_port, name, description);
advertiser->contactMasterServer(); advertiser->contactMasterServer();
} }

31
src/config_manager.cpp
View File

@ -5,6 +5,7 @@ ConfigManager::ConfigManager(QSettings* p_config)
config = p_config; config = p_config;
} }
// Validate and set up the config
bool ConfigManager::initConfig() bool ConfigManager::initConfig()
{ {
config->beginGroup("Info"); config->beginGroup("Info");
@ -100,3 +101,33 @@ void ConfigManager::updateConfig(int current_version)
} }
} }
} }
// Validate and retriever settings related to advertising and the server
bool ConfigManager::loadAdvertiserSettings(QString* ms_ip, int* port, int* ws_port, int* local_port, QString* name, QString* description, bool* advertise_server)
{
// TODO: Move this logic into config_manager.cpp
bool port_conversion_success;
bool ws_port_conversion_success;
bool local_port_conversion_success;
config->beginGroup("Options");
*ms_ip = config->value("ms_ip", "master.aceattorneyonline.com").toString();
*port = config->value("ms_port", "27016").toInt(&port_conversion_success);
*ws_port = config->value("webao_port", "27017").toInt(&ws_port_conversion_success);
*local_port = config->value("port", "27016").toInt(&local_port_conversion_success);
*name = config->value("server_name", "My First Server").toString();
*description = config->value("server_description", "This is my flashy new server").toString();
config->endGroup();
if(!port_conversion_success || !ws_port_conversion_success || !local_port_conversion_success) {
return false;
} else {
if(config->value("advertise", "true").toString() != "true")
*advertise_server = false;
else
*advertise_server = true;
if(config->value("webao_enable", "true").toString() != "true")
*ws_port = -1;
return true;
}
}