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

Issue #77 Break cyclic dependency between CDatastoreUtility CAircraftModelList by factoring out dependent functionality

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-11-09 18:33:05 +00:00
parent 2cf02c484e
commit 761fd56cc9
8 changed files with 86 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/blackcore/db/databasewriter.cpp
View File

@@ -185,7 +185,7 @@ namespace BlackCore
CAircraftModelList modelsSkipped;
CStatusMessageList msgs;
bool directWrite;
const bool sendingSuccessful = CDatastoreUtility::parseSwiftPublishResponse(responseData, modelsPublished, modelsSkipped, msgs, directWrite);
const bool sendingSuccessful = parseSwiftPublishResponse(responseData, modelsPublished, modelsSkipped, msgs, directWrite);
const int c = CDatabaseUtils::fillInMissingAircraftAndLiveryEntities(modelsPublished);
emit this->publishedModels(modelsPublished, modelsSkipped, msgs, sendingSuccessful, directWrite);
@@ -276,5 +276,84 @@ namespace BlackCore
}
return arrays;
}
bool CDatabaseWriter::parseSwiftPublishResponse(const QString &jsonResponse, CAircraftModelList &publishedModels, CAircraftModelList &skippedModels, CStatusMessageList &messages, bool &directWrite)
{
directWrite = false;
if (jsonResponse.isEmpty())
{
messages.push_back(CStatusMessage(static_cast<CDatabaseWriter *>(nullptr), CStatusMessage::SeverityError, u"Empty JSON data for published models"));
return false;
}
const QJsonDocument jsonDoc(QJsonDocument::fromJson(jsonResponse.toUtf8()));
// array of messages only
if (jsonDoc.isArray())
{
const CStatusMessageList msgs(CStatusMessageList::fromDatabaseJson(jsonDoc.array()));
messages.push_back(msgs);
return true;
}
// no object -> most likely some fucked up HTML string with the PHP error
if (!jsonDoc.isObject())
{
const QString phpError(CNetworkUtils::removeHtmlPartsFromPhpErrorMessage(jsonResponse));
messages.push_back(CStatusMessage(static_cast<CDatabaseWriter *>(nullptr), CStatusMessage::SeverityError, phpError));
return false;
}
// fully blown object
QJsonObject json(jsonDoc.object());
bool hasData = false;
if (json.contains("msgs"))
{
const QJsonValue msgJson(json.take("msgs"));
const CStatusMessageList msgs(CStatusMessageList::fromDatabaseJson(msgJson.toArray()));
if (!msgs.isEmpty())
{
messages.push_back(msgs);
hasData = true;
}
}
// direct write means models written, otherwise CRs
if (json.contains("directWrite"))
{
const QJsonValue dw(json.take("directWrite"));
directWrite = dw.toBool(false);
}
if (json.contains("publishedModels"))
{
const QJsonValue publishedJson(json.take("publishedModels"));
const CAircraftModelList published = CAircraftModelList::fromDatabaseJson(publishedJson.toArray(), "");
if (!published.isEmpty())
{
publishedModels.push_back(published);
hasData = true;
}
}
if (json.contains("skippedModels"))
{
const QJsonValue skippedJson(json.take("skippedModels"));
const CAircraftModelList skipped = CAircraftModelList::fromDatabaseJson(skippedJson.toArray(), "");
if (!skipped.isEmpty())
{
skippedModels.push_back(skipped);
hasData = true;
}
}
if (!hasData)
{
messages.push_back(CStatusMessage(static_cast<CDatabaseWriter *>(nullptr), CStatusMessage::SeverityError, u"Received response, but no JSON data"));
}
return hasData;
}
} // ns
} // ns

6
src/blackcore/db/databasewriter.h
View File

@@ -104,6 +104,12 @@ namespace BlackCore
//! Split data array
static QList<QByteArray> splitData(const QByteArray &data, int size);
//! Get data from a DB response
static bool parseSwiftPublishResponse(const QString &jsonResponse,
BlackMisc::Simulation::CAircraftModelList &publishedModels,
BlackMisc::Simulation::CAircraftModelList &skippedModels,
BlackMisc::CStatusMessageList &messages, bool &directWrite);
};
} // ns
} // ns

1
src/blackmisc/aviation/aircraftcategory.cpp
View File

@@ -25,7 +25,6 @@
using namespace BlackMisc;
using namespace BlackMisc::Db;
using namespace BlackMisc::Simulation;
namespace BlackMisc
{

1
src/blackmisc/aviation/aircrafticaocode.cpp
View File

@@ -28,7 +28,6 @@
using namespace BlackMisc;
using namespace BlackMisc::Db;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Simulation;
namespace BlackMisc
{

1
src/blackmisc/aviation/airlineicaocode.cpp
View File

@@ -30,7 +30,6 @@
using namespace BlackMisc;
using namespace BlackMisc::Db;
using namespace BlackMisc::Simulation;
namespace BlackMisc
{

1
src/blackmisc/aviation/livery.cpp
View File

@@ -27,7 +27,6 @@
using namespace BlackMisc;
using namespace BlackMisc::Db;
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Simulation;
namespace BlackMisc
{

81
src/blackmisc/db/datastoreutility.cpp
View File

@@ -8,7 +8,6 @@
#include "blackmisc/db/datastoreutility.h"
#include "blackmisc/logcategories.h"
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackmisc/network/networkutils.h"
#include "blackmisc/statusmessage.h"
#include "blackmisc/statusmessagelist.h"
@@ -21,7 +20,6 @@
#include <QTimeZone>
using namespace BlackMisc;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Network;
namespace BlackMisc
@@ -79,85 +77,6 @@ namespace BlackMisc
return parseDateTimeStringOptimized(removeDateTimeSeparators(timestamp));
}
bool CDatastoreUtility::parseSwiftPublishResponse(const QString &jsonResponse, CAircraftModelList &publishedModels, CAircraftModelList &skippedModels, CStatusMessageList &messages, bool &directWrite)
{
directWrite = false;
if (jsonResponse.isEmpty())
{
messages.push_back(CStatusMessage(static_cast<CDatastoreUtility *>(nullptr), CStatusMessage::SeverityError, u"Empty JSON data for published models"));
return false;
}
const QJsonDocument jsonDoc(QJsonDocument::fromJson(jsonResponse.toUtf8()));
// array of messages only
if (jsonDoc.isArray())
{
const CStatusMessageList msgs(CStatusMessageList::fromDatabaseJson(jsonDoc.array()));
messages.push_back(msgs);
return true;
}
// no object -> most likely some fucked up HTML string with the PHP error
if (!jsonDoc.isObject())
{
const QString phpError(CNetworkUtils::removeHtmlPartsFromPhpErrorMessage(jsonResponse));
messages.push_back(CStatusMessage(static_cast<CDatastoreUtility *>(nullptr), CStatusMessage::SeverityError, phpError));
return false;
}
// fully blown object
QJsonObject json(jsonDoc.object());
bool hasData = false;
if (json.contains("msgs"))
{
const QJsonValue msgJson(json.take("msgs"));
const CStatusMessageList msgs(CStatusMessageList::fromDatabaseJson(msgJson.toArray()));
if (!msgs.isEmpty())
{
messages.push_back(msgs);
hasData = true;
}
}
// direct write means models written, otherwise CRs
if (json.contains("directWrite"))
{
const QJsonValue dw(json.take("directWrite"));
directWrite = dw.toBool(false);
}
if (json.contains("publishedModels"))
{
const QJsonValue publishedJson(json.take("publishedModels"));
const CAircraftModelList published = CAircraftModelList::fromDatabaseJson(publishedJson.toArray(), "");
if (!published.isEmpty())
{
publishedModels.push_back(published);
hasData = true;
}
}
if (json.contains("skippedModels"))
{
const QJsonValue skippedJson(json.take("skippedModels"));
const CAircraftModelList skipped = CAircraftModelList::fromDatabaseJson(skippedJson.toArray(), "");
if (!skipped.isEmpty())
{
skippedModels.push_back(skipped);
hasData = true;
}
}
if (!hasData)
{
messages.push_back(CStatusMessage(static_cast<CDatastoreUtility *>(nullptr), CStatusMessage::SeverityError, u"Received response, but no JSON data"));
}
return hasData;
}
bool CDatastoreUtility::parseAutoPublishResponse(const QString &jsonResponse, CStatusMessageList &messages)
{
if (jsonResponse.isEmpty())

7
src/blackmisc/db/datastoreutility.h
View File

@@ -21,7 +21,6 @@ namespace BlackMisc
{
class CStatusMessageList;
namespace Simulation { class CAircraftModelList; }
namespace Db
{
/*!
@@ -51,12 +50,6 @@ namespace BlackMisc
//! Parse a timestamp object
static QDateTime parseTimestamp(const QString &timestamp);
//! Get data from a DB response
static bool parseSwiftPublishResponse(const QString &jsonResponse,
Simulation::CAircraftModelList &publishedModels,
Simulation::CAircraftModelList &skippedModels,
CStatusMessageList &messages, bool &directWrite);
//! Auto publish response
static bool parseAutoPublishResponse(const QString &jsonResponse, CStatusMessageList &messages);
};