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

make no gui build

Browse Source
This commit is contained in:
scatterflower 2020-09-01 15:43:48 -05:00
parent caeda501c3
commit ccfb6481cf
8 changed files with 47 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
akashi.pro
View File

@ -1,6 +1,7 @@
QT += core gui network websockets
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
QT += network websockets core
QT -= gui
TEMPLATE = app
# greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
CONFIG += c++11

2
include/advertiser.h
View File

@ -20,7 +20,7 @@
#include "include/aopacket.h"
#include <QApplication>
#include <QCoreApplication>
#include <QHostAddress>
#include <QString>
#include <QTcpSocket>

52
include/akashimain.h
View File

@ -1,52 +0,0 @@
//////////////////////////////////////////////////////////////////////////////////////
// akashi - a server for Attorney Online 2 //
// Copyright (C) 2020 scatterflower //
// //
// This program is free software: you can redistribute it and/or modify //
// it under the terms of the GNU Affero General Public License as //
// published by the Free Software Foundation, either version 3 of the //
// License, or (at your option) any later version. //
// //
// This program is distributed in the hope that it will be useful, //
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
// GNU Affero General Public License for more details. //
// //
// You should have received a copy of the GNU Affero General Public License //
// along with this program. If not, see <https://www.gnu.org/licenses/>. //
//////////////////////////////////////////////////////////////////////////////////////
#ifndef AKASHIMAIN_H
#define AKASHIMAIN_H
#include "include/advertiser.h"
#include "include/config_manager.h"
#include "include/server.h"
#include <QDebug>
#include <QMainWindow>
#include <QSettings>
QT_BEGIN_NAMESPACE
namespace Ui {
class AkashiMain;
}
QT_END_NAMESPACE
class AkashiMain : public QMainWindow {
Q_OBJECT
public:
AkashiMain(QWidget* parent = nullptr);
~AkashiMain();
ConfigManager config_manager;
void generateDefaultConfig(bool backup_old);
void updateConfig(int current_version);
private:
Ui::AkashiMain* ui;
Advertiser* advertiser;
Server* server;
};
#endif // AKASHIMAIN_H

2
include/server.h
View File

@ -23,7 +23,7 @@
#include "include/area_data.h"
#include "include/ws_proxy.h"
#include <QApplication>
#include <QCoreApplication>
#include <QDebug>
#include <QFile>
#include <QMap>

2
src/advertiser.cpp
View File

@ -62,7 +62,7 @@ void Advertiser::socketConnected()
AOPacket ao_packet("SCC",
{concat_ports, name, description,
"akashi v" + QApplication::applicationVersion()});
"akashi v" + QCoreApplication::applicationVersion()});
QByteArray data = ao_packet.toUtf8();
socket->write(data);

60
src/akashimain.cpp
View File

@ -1,60 +0,0 @@
//////////////////////////////////////////////////////////////////////////////////////
// akashi - a server for Attorney Online 2 //
// Copyright (C) 2020 scatterflower //
// //
// This program is free software: you can redistribute it and/or modify //
// it under the terms of the GNU Affero General Public License as //
// published by the Free Software Foundation, either version 3 of the //
// License, or (at your option) any later version. //
// //
// This program is distributed in the hope that it will be useful, //
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
// GNU Affero General Public License for more details. //
// //
// You should have received a copy of the GNU Affero General Public License //
// along with this program. If not, see <https://www.gnu.org/licenses/>. //
//////////////////////////////////////////////////////////////////////////////////////
#include "include/akashimain.h"
#include "ui_akashimain.h"
AkashiMain::AkashiMain(QWidget* parent)
: QMainWindow(parent), config_manager(), ui(new Ui::AkashiMain)
{
ui->setupUi(this);
qDebug("Main application started");
if (config_manager.initConfig()) {
// Config is sound, so proceed with starting the server
// Validate some of the config before passing it on
ConfigManager::server_settings settings;
bool config_valid = config_manager.loadServerSettings(&settings);
if (!config_valid) {
// TODO: send signal config invalid
config_manager.generateDefaultConfig(true);
}
else {
if (settings.advertise_server) {
// TODO: send signal advertiser started
advertiser =
new Advertiser(settings.ms_ip, settings.port,
settings.ws_port, settings.local_port,
settings.name, settings.description, this);
advertiser->contactMasterServer();
}
// TODO: start the server here
// TODO: send signal server starting.
server = new Server(settings.port, settings.ws_port);
server->start();
}
}
}
AkashiMain::~AkashiMain()
{
delete ui;
delete advertiser;
delete server;
}

2
src/aoclient.cpp
View File

@ -73,7 +73,7 @@ void AOClient::handlePacket(AOPacket packet)
// Lord forgive me
if (packet.header == "HI") {
setHwid(packet.contents[0]);
sendPacket("ID", {"271828", "akashi", QApplication::applicationVersion()});
sendPacket("ID", {"271828", "akashi", QCoreApplication::applicationVersion()});
}
else if (packet.header == "ID") {
QSettings config("config.ini", QSettings::IniFormat);

54
src/main.cpp
View File

@ -15,13 +15,14 @@
// You should have received a copy of the GNU Affero General Public License //
// along with this program. If not, see <https://www.gnu.org/licenses/>. //
//////////////////////////////////////////////////////////////////////////////////////
#include "include/akashimain.h"
#include "include/advertiser.h"
#include "include/server.h"
#include "include/config_manager.h"
#ifdef _WIN32
#include <Windows.h>
#endif
#include <QApplication>
#include <QCoreApplication>
#include <QCommandLineOption>
#include <QCommandLineParser>
#include <QDebug>
@ -29,6 +30,9 @@
#include <QSettings>
#include <QTranslator>
Advertiser* advertiser;
Server* server;
int main(int argc, char* argv[])
{
#ifdef _WIN32
@ -46,9 +50,9 @@ int main(int argc, char* argv[])
}
}
#endif
QApplication app(argc, argv);
QApplication::setApplicationName("akashi");
QApplication::setApplicationVersion("0.0.1");
QCoreApplication app(argc, argv);
QCoreApplication::setApplicationName("akashi");
QCoreApplication::setApplicationVersion("0.0.1");
QSettings config("config.ini", QSettings::IniFormat);
config.beginGroup("Options");
@ -70,23 +74,43 @@ int main(int argc, char* argv[])
parser.addHelpOption();
parser.addVersionOption();
QCommandLineOption headlessOption(
QStringList() << "l"
<< "headless",
app.translate("main", "Run the server without a GUI."));
QCommandLineOption verboseNetworkOption(
QStringList() << "nv"
<< "verbose-network",
app.translate("main", "Write all network traffic to the console."));
parser.addOption(headlessOption);
parser.addOption(verboseNetworkOption);
parser.process(app);
bool headless = parser.isSet(headlessOption);
AkashiMain w;
if (!headless)
w.show();
qDebug("Main application started");
ConfigManager config_manager;
if (config_manager.initConfig()) {
// Config is sound, so proceed with starting the server
// Validate some of the config before passing it on
ConfigManager::server_settings settings;
bool config_valid = config_manager.loadServerSettings(&settings);
if (!config_valid) {
// TODO: send signal config invalid
config_manager.generateDefaultConfig(true);
}
else {
if (settings.advertise_server) {
// TODO: send signal advertiser started
advertiser =
new Advertiser(settings.ms_ip, settings.port,
settings.ws_port, settings.local_port,
settings.name, settings.description);
advertiser->contactMasterServer();
}
// TODO: start the server here
// TODO: send signal server starting.
server = new Server(settings.port, settings.ws_port);
server->start();
}
}
return app.exec();
}