flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-14 00:25:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T730, renamed to CApiServerConnection

Browse Source
This commit is contained in:
Klaus Basan
2019-10-03 23:22:56 +02:00
committed by Mat Sutcliffe
parent 61d82ab780
commit 27fedad3fd
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/blackcore/afv/connection/apiserverconnection.cpp
View File

@@ -28,14 +28,14 @@ namespace BlackCore
{ {
namespace Connection namespace Connection
{ {
ApiServerConnection::ApiServerConnection(const QString &address, QObject *parent) : CApiServerConnection::CApiServerConnection(const QString &address, QObject *parent) :
QObject(parent), QObject(parent),
m_address(address) m_address(address)
{ {
CLogMessage(this).debug(u"ApiServerConnection instantiated"); CLogMessage(this).debug(u"ApiServerConnection instantiated");
} }
bool ApiServerConnection::connectTo(const QString &username, const QString &password, const QUuid &networkVersion) bool CApiServerConnection::connectTo(const QString &username, const QString &password, const QUuid &networkVersion)
{ {
if (isShuttingDown()) { return false; } if (isShuttingDown()) { return false; }
@@ -116,17 +116,17 @@ namespace BlackCore
return m_isAuthenticated; return m_isAuthenticated;
} }
PostCallsignResponseDto ApiServerConnection::addCallsign(const QString &callsign) PostCallsignResponseDto CApiServerConnection::addCallsign(const QString &callsign)
{ {
return this->postNoRequest<PostCallsignResponseDto>("/api/v1/users/" + m_username + "/callsigns/" + callsign); return this->postNoRequest<PostCallsignResponseDto>("/api/v1/users/" + m_username + "/callsigns/" + callsign);
} }
void ApiServerConnection::removeCallsign(const QString &callsign) void CApiServerConnection::removeCallsign(const QString &callsign)
{ {
this->deleteResource("/api/v1/users/" + m_username + "/callsigns/" + callsign); this->deleteResource("/api/v1/users/" + m_username + "/callsigns/" + callsign);
} }
void ApiServerConnection::updateTransceivers(const QString &callsign, const QVector<TransceiverDto> &transceivers) void CApiServerConnection::updateTransceivers(const QString &callsign, const QVector<TransceiverDto> &transceivers)
{ {
QJsonArray array; QJsonArray array;
for (const TransceiverDto &tx : transceivers) for (const TransceiverDto &tx : transceivers)
@@ -136,19 +136,19 @@ namespace BlackCore
this->postNoResponse("/api/v1/users/" + m_username + "/callsigns/" + callsign + "/transceivers", QJsonDocument(array)); this->postNoResponse("/api/v1/users/" + m_username + "/callsigns/" + callsign + "/transceivers", QJsonDocument(array));
} }
void ApiServerConnection::forceDisconnect() void CApiServerConnection::forceDisconnect()
{ {
m_isAuthenticated = false; m_isAuthenticated = false;
m_jwt.clear(); m_jwt.clear();
} }
QVector<StationDto> ApiServerConnection::getAllAliasedStations() QVector<StationDto> CApiServerConnection::getAllAliasedStations()
{ {
this->getAsVector<StationDto>("/api/v1/stations/aliased"); this->getAsVector<StationDto>("/api/v1/stations/aliased");
return {}; return {};
} }
QByteArray ApiServerConnection::getWithResponse(const QNetworkRequest &request) QByteArray CApiServerConnection::getWithResponse(const QNetworkRequest &request)
{ {
if (isShuttingDown()) { return {}; } if (isShuttingDown()) { return {}; }
@@ -184,7 +184,7 @@ namespace BlackCore
return receivedData; return receivedData;
} }
QByteArray ApiServerConnection::postWithResponse(const QNetworkRequest &request, const QByteArray &data) QByteArray CApiServerConnection::postWithResponse(const QNetworkRequest &request, const QByteArray &data)
{ {
if (isShuttingDown()) { return {}; } if (isShuttingDown()) { return {}; }
@@ -220,7 +220,7 @@ namespace BlackCore
return receivedData; return receivedData;
} }
void ApiServerConnection::postNoResponse(const QString &resource, const QJsonDocument &json) void CApiServerConnection::postNoResponse(const QString &resource, const QJsonDocument &json)
{ {
if (isShuttingDown()) { return; } // avoid crash if (isShuttingDown()) { return; } // avoid crash
if (!m_isAuthenticated) if (!m_isAuthenticated)
@@ -254,7 +254,7 @@ namespace BlackCore
}); });
} }
void ApiServerConnection::deleteResource(const QString &resource) void CApiServerConnection::deleteResource(const QString &resource)
{ {
if (isShuttingDown()) { return; } if (isShuttingDown()) { return; }
if (!m_isAuthenticated) { return; } if (!m_isAuthenticated) { return; }
@@ -282,7 +282,7 @@ namespace BlackCore
}); });
} }
void ApiServerConnection::checkExpiry() void CApiServerConnection::checkExpiry()
{ {
if (QDateTime::currentDateTimeUtc() > m_expiryLocalUtc.addSecs(-5 * 60)) if (QDateTime::currentDateTimeUtc() > m_expiryLocalUtc.addSecs(-5 * 60))
{ {
@@ -290,7 +290,7 @@ namespace BlackCore
} }
} }
void ApiServerConnection::logReplyErrorMessage(const QNetworkReply *reply, const QString &addMsg) void CApiServerConnection::logReplyErrorMessage(const QNetworkReply *reply, const QString &addMsg)
{ {
if (!reply) { return; } if (!reply) { return; }
if (addMsg.isEmpty()) if (addMsg.isEmpty())
@@ -303,7 +303,7 @@ namespace BlackCore
} }
} }
void ApiServerConnection::logRequestDuration(const QNetworkReply *reply, const QString &addMsg) void CApiServerConnection::logRequestDuration(const QNetworkReply *reply, const QString &addMsg)
{ {
if (!reply) { return; } if (!reply) { return; }
const qint64 d = CNetworkUtils::requestDuration(reply); const qint64 d = CNetworkUtils::requestDuration(reply);
@@ -318,7 +318,7 @@ namespace BlackCore
} }
} }
bool ApiServerConnection::isShuttingDown() bool CApiServerConnection::isShuttingDown()
{ {
return !sApp || sApp->isShuttingDown(); return !sApp || sApp->isShuttingDown();
} }

4
src/blackcore/afv/connection/apiserverconnection.h
View File

@@ -32,7 +32,7 @@ namespace BlackCore
namespace Connection namespace Connection
{ {
//! A server connection //! A server connection
class ApiServerConnection : public QObject class CApiServerConnection : public QObject
{ {
Q_OBJECT Q_OBJECT
@@ -44,7 +44,7 @@ namespace BlackCore
}; };
//! Constructor //! Constructor
ApiServerConnection(const QString &address, QObject *parent = nullptr); CApiServerConnection(const QString &address, QObject *parent = nullptr);
//! User authenticated? //! User authenticated?
bool isAuthenticated() const { return m_isAuthenticated; } bool isAuthenticated() const { return m_isAuthenticated; }

2
src/blackcore/afv/connection/clientconnection.cpp
View File

@@ -21,7 +21,7 @@ namespace BlackCore
QObject(parent), QObject(parent),
m_udpSocket(new QUdpSocket(this)), m_udpSocket(new QUdpSocket(this)),
m_voiceServerTimer(new QTimer(this)), m_voiceServerTimer(new QTimer(this)),
m_apiServerConnection(new ApiServerConnection(apiServer, this)) m_apiServerConnection(new CApiServerConnection(apiServer, this))
{ {
qDebug() << "ClientConnection instantiated"; qDebug() << "ClientConnection instantiated";

2
src/blackcore/afv/connection/clientconnection.h
View File

@@ -89,7 +89,7 @@ namespace BlackCore
QTimer *m_voiceServerTimer = nullptr; QTimer *m_voiceServerTimer = nullptr;
// API server // API server
ApiServerConnection *m_apiServerConnection = nullptr; CApiServerConnection *m_apiServerConnection = nullptr;
// Properties // Properties
bool m_receiveAudioDto = true; bool m_receiveAudioDto = true;