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

clang format

Browse Source
This commit is contained in:
scatterflower 2020-08-23 14:45:11 -05:00
parent a3d2c1aa66
commit 28ed456386
12 changed files with 283 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.clang-format Normal file
View File

@ -0,0 +1,2 @@
BasedOnStyle: LLVM
BreakBeforeBraces: Stroustrup

7
include/advertiser.h
View File

@ -3,16 +3,17 @@
#include <include/packet_manager.h>
#include <QString>
#include <QTcpSocket>
#include <QApplication>
#include <QHostAddress>
#include <QString>
#include <QTcpSocket>
class Advertiser : public QObject {
Q_OBJECT
public:
Advertiser(QString p_ip, int p_port, int p_ws_port, int p_local_port, QString p_name, QString p_description);
Advertiser(QString p_ip, int p_port, int p_ws_port, int p_local_port,
QString p_name, QString p_description);
void contactMasterServer();
signals:

10
include/akashimain.h
View File

@ -5,16 +5,17 @@
#include <include/config_manager.h>
#include <include/server.h>
#include <QDebug>
#include <QMainWindow>
#include <QSettings>
#include <QDebug>
QT_BEGIN_NAMESPACE
namespace Ui { class AkashiMain; }
namespace Ui {
class AkashiMain;
}
QT_END_NAMESPACE
class AkashiMain : public QMainWindow
{
class AkashiMain : public QMainWindow {
Q_OBJECT
public:
@ -26,6 +27,7 @@ public:
void generateDefaultConfig(bool backup_old);
void updateConfig(int current_version);
private:
Ui::AkashiMain *ui;
Advertiser *advertiser;

10
include/config_manager.h
View File

@ -3,10 +3,10 @@
#define CONFIG_VERSION 1
#include <QSettings>
#include <QFileInfo>
#include <QDir>
#include <QDebug>
#include <QDir>
#include <QFileInfo>
#include <QSettings>
class ConfigManager {
public:
@ -15,7 +15,9 @@ public:
void generateDefaultConfig(bool backup_old);
void updateConfig(int current_version);
bool loadServerSettings(QString* ms_ip, int* port, int* ws_port, int* local_port, QString* name, QString* description, bool* advertise_server);
bool loadServerSettings(QString *ms_ip, int *port, int *ws_port,
int *local_port, QString *name, QString *description,
bool *advertise_server);
private:
QSettings *config;

5
include/server.h
View File

@ -1,11 +1,10 @@
#ifndef SERVER_H
#define SERVER_H
#include <QTcpServer>
#include <QString>
#include <QTcpServer>
class Server : public QObject
{
class Server : public QObject {
Q_OBJECT
public:

19
src/advertiser.cpp
View File

@ -1,6 +1,7 @@
#include "include/advertiser.h"
Advertiser::Advertiser(QString p_ip, int p_port, int p_ws_port, int p_local_port, QString p_name, QString p_description)
Advertiser::Advertiser(QString p_ip, int p_port, int p_ws_port,
int p_local_port, QString p_name, QString p_description)
{
ip = p_ip;
port = p_port;
@ -10,7 +11,8 @@ Advertiser::Advertiser(QString p_ip, int p_port, int p_ws_port, int p_local_port
description = p_description;
}
void Advertiser::contactMasterServer() {
void Advertiser::contactMasterServer()
{
socket = new QTcpSocket(this);
connect(socket, SIGNAL(readyRead()), this, SLOT(readData()));
connect(socket, SIGNAL(connected()), this, SLOT(socketConnected()));
@ -20,14 +22,16 @@ void Advertiser::contactMasterServer() {
socket->connectToHost(ip, port);
}
void Advertiser::readData() {
void Advertiser::readData()
{
// The information coming back from the MS isn't very useful
// However, it can be useful to see it when debugging
// TODO: master network debug switch
// qDebug() << socket->readAll();
}
void Advertiser::socketConnected() {
void Advertiser::socketConnected()
{
// TODO: fire a signal here, i18n
qDebug("Connected to the master server");
QString concat_ports;
@ -36,14 +40,17 @@ void Advertiser::socketConnected() {
else
concat_ports = QString::number(local_port) + "&" + QString::number(ws_port);
QString ao_packet = PacketManager::buildPacket("SCC", {concat_ports, name, description, "akashi v" + QApplication::applicationVersion()});
QString ao_packet = PacketManager::buildPacket(
"SCC", {concat_ports, name, description,
"akashi v" + QApplication::applicationVersion()});
QByteArray data = ao_packet.toUtf8();
socket->write(data);
socket->flush();
}
void Advertiser::socketDisconnected() {
void Advertiser::socketDisconnected()
{
// TODO: fire a signal here, i18n
qDebug("Connection to master server lost");
}

22
src/akashimain.cpp
View File

@ -2,10 +2,8 @@
#include "ui_akashimain.h"
AkashiMain::AkashiMain(QWidget *parent)
: QMainWindow(parent)
, config("config.ini", QSettings::IniFormat)
, config_manager(&config)
, ui(new Ui::AkashiMain)
: QMainWindow(parent), config("config.ini", QSettings::IniFormat),
config_manager(&config), ui(new Ui::AkashiMain)
{
ui->setupUi(this);
qDebug("Main application started");
@ -16,14 +14,18 @@ AkashiMain::AkashiMain(QWidget *parent)
QString ms_ip, name, description;
int port, ws_port, local_port;
bool advertise_server;
bool config_valid = config_manager.loadServerSettings(&ms_ip, &port, &ws_port, &local_port, &name, &description, &advertise_server);
bool config_valid = config_manager.loadServerSettings(
&ms_ip, &port, &ws_port, &local_port, &name, &description,
&advertise_server);
if (!config_valid) {
// TODO: send signal config invalid
config_manager.generateDefaultConfig(true);
} else {
}
else {
if (advertise_server) {
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();
}
@ -35,8 +37,4 @@ AkashiMain::AkashiMain(QWidget *parent)
}
}
AkashiMain::~AkashiMain()
{
delete ui;
}
AkashiMain::~AkashiMain() { delete ui; }

50
src/config_manager.cpp
View File

@ -1,9 +1,6 @@
#include <include/config_manager.h>
ConfigManager::ConfigManager(QSettings* p_config)
{
config = p_config;
}
ConfigManager::ConfigManager(QSettings *p_config) { config = p_config; }
// Validate and set up the config
bool ConfigManager::initConfig()
@ -17,7 +14,8 @@ bool ConfigManager::initConfig()
if (!(check_file.exists() && check_file.isFile())) {
// TODO: send signal config doesn't exist
generateDefaultConfig(false);
} else {
}
else {
// TODO: send signal config is invalid
generateDefaultConfig(true);
}
@ -33,13 +31,15 @@ bool ConfigManager::initConfig()
// This means the config is invalid
// TODO: send invalid config signal
return false;
} else {
}
else {
// Config is valid and up to date, so let's go ahead
return true;
}
}
// Setting backup_old to true will move the existing config.ini to config_old.ini
// Setting backup_old to true will move the existing config.ini to
// config_old.ini
void ConfigManager::generateDefaultConfig(bool backup_old)
{
qDebug() << "Config is invalid or missing, making a new one...";
@ -79,20 +79,23 @@ void ConfigManager::generateDefaultConfig(bool backup_old)
void ConfigManager::updateConfig(int current_version)
{
if (current_version > CONFIG_VERSION) {
// Config version is newer than the latest version, and the config is invalid
// This could also mean the server is out of date, and the user should be shown a relevant message
// Regardless, regen the config anyways
// Config version is newer than the latest version, and the config is
// invalid This could also mean the server is out of date, and the user
// should be shown a relevant message Regardless, regen the config anyways
// TODO: send signal config is invalid
generateDefaultConfig(true);
}
else if (current_version < 0) {
// Negative version number? Invalid!
generateDefaultConfig(true);
} else {
}
else {
// TODO: send signal config is out of date, and is being updated
// Update the config as needed using a switch. This is nice because we can fall through as we go up the version ladder.
// Update the config as needed using a switch. This is nice because we can
// fall through as we go up the version ladder.
switch (current_version) {
case 0: // Version 0 doesn't actually exist, but we should check for it just in case
case 0: // Version 0 doesn't actually exist, but we should check for it just
// in case
case 1:
config->beginGroup("Info");
config->setValue("version", CONFIG_VERSION);
@ -103,7 +106,10 @@ void ConfigManager::updateConfig(int current_version)
}
// Validate and retriever settings related to advertising and the server
bool ConfigManager::loadServerSettings(QString* ms_ip, int* port, int* ws_port, int* local_port, QString* name, QString* description, bool* advertise_server)
bool ConfigManager::loadServerSettings(QString *ms_ip, int *port, int *ws_port,
int *local_port, QString *name,
QString *description,
bool *advertise_server)
{
bool port_conversion_success;
bool ws_port_conversion_success;
@ -111,14 +117,20 @@ bool ConfigManager::loadServerSettings(QString* ms_ip, int* port, int* ws_port,
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);
*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();
*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) {
if (!port_conversion_success || !ws_port_conversion_success ||
!local_port_conversion_success) {
return false;
} else {
}
else {
if (config->value("advertise", "true").toString() != "true")
*advertise_server = false;
else

15
src/main.cpp
View File

@ -1,12 +1,12 @@
#include "include/akashimain.h"
#include <QApplication>
#include <QCommandLineParser>
#include <QCommandLineOption>
#include <QCommandLineParser>
#include <QDebug>
#include <QLibraryInfo>
#include <QTranslator>
#include <QSettings>
#include <QTranslator>
int main(int argc, char *argv[])
{
@ -19,7 +19,8 @@ int main(int argc, char *argv[])
QString language = config.value("language", QLocale().bcp47Name()).toString();
QTranslator qt_translator;
qt_translator.load("qt_" + language, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
qt_translator.load("qt_" + language,
QLibraryInfo::location(QLibraryInfo::TranslationsPath));
app.installTranslator(&qt_translator);
QTranslator translator;
@ -27,11 +28,15 @@ int main(int argc, char *argv[])
app.installTranslator(&translator);
QCommandLineParser parser;
parser.setApplicationDescription(app.translate("main", "A server for Attorney Online 2"));
parser.setApplicationDescription(
app.translate("main", "A server for Attorney Online 2"));
parser.addHelpOption();
parser.addVersionOption();
QCommandLineOption headlessOption(QStringList() << "l" << "headless", app.translate("main", "Run the server without a GUI"));
QCommandLineOption headlessOption(
QStringList() << "l"
<< "headless",
app.translate("main", "Run the server without a GUI"));
parser.addOption(headlessOption);
parser.process(app);

5
src/server.cpp
View File

@ -6,7 +6,4 @@ Server::Server(int p_port, int p_ws_port)
ws_port = p_ws_port;
}
void Server::start()
{
}
void Server::start() {}