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

refs #452, data readers / writers for DB (via web services)

Browse Source 
* flags for readers (which reader is reading specific entities etc.)
* web data services: bundling multiple readers (webdataservices) and implementing IWebDataReaderProvider
* readers now able to read single entities
This commit is contained in:
Klaus Basan
2015-09-23 19:05:31 +02:00
committed by Mathew Sutcliffe
parent 33330394a9
commit 07c6370819
15 changed files with 1538 additions and 586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

183
src/blackcore/modeldatareader.cpp
View File

@@ -9,6 +9,7 @@
#include "blackmisc/sequence.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/networkutils.h"
#include "modeldatareader.h"
#include <QRegularExpression>
@@ -16,6 +17,7 @@
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Network;
namespace BlackCore
{
@@ -40,6 +42,50 @@ namespace BlackCore
return m_liveries;
}
CLivery CModelDataReader::getLiveryForCombinedCode(const QString &combinedCode) const
{
if (!CLivery::isValidCombinedCode(combinedCode)) { return CLivery(); }
CLiveryList liveries(getLiveries());
return liveries.findByCombinedCode(combinedCode);
}
CLivery CModelDataReader::getLiveryForDbKey(int id) const
{
if (id < 0) { return CLivery(); }
CLiveryList liveries(getLiveries());
return liveries.findByKey(id);
}
CLivery CModelDataReader::smartLiverySelector(const CLivery &livery) const
{
CLiveryList liveries(getLiveries()); // thread safe copy
// first try on id, that would be perfect
if (livery.hasValidDbKey())
{
int k = livery.getDbKey();
CLivery l(liveries.findByKey(k));
if (l.hasCompleteData()) { return l; }
}
// by combined code
if (livery.hasCombinedCode())
{
QString cc(livery.getCombinedCode());
CLivery l(liveries.findByCombinedCode(cc));
if (l.hasCompleteData()) { return l; }
}
if (livery.hasValidAirlineDesignator())
{
QString icao(livery.getAirlineIcaoCodeDesignator());
CLivery l(liveries.findByAirlineIcaoDesignatorStdLivery(icao));
if (l.hasCompleteData()) { return l; }
}
return CLivery();
}
CDistributorList CModelDataReader::getDistributors() const
{
QReadLocker l(&m_lockDistributor);
@@ -52,6 +98,20 @@ namespace BlackCore
return m_models;
}
CAircraftModel CModelDataReader::getModelForModelString(const QString &modelString) const
{
if (modelString.isEmpty()) { return CAircraftModel(); }
CAircraftModelList models(getModels());
return models.findFirstByModelString(modelString);
}
CAircraftModelList CModelDataReader::getModelsForAircraftDesignatorAndLiveryCombinedCode(const QString &aircraftDesignator, const QString &combinedCode)
{
if (aircraftDesignator.isEmpty()) { return CAircraftModelList(); }
CAircraftModelList models(getModels());
return models.findByAircraftDesignatorAndLiveryCombinedCode(aircraftDesignator, combinedCode);
}
int CModelDataReader::getLiveriesCount() const
{
QReadLocker l(&m_lockLivery);
@@ -64,21 +124,45 @@ namespace BlackCore
return m_distributors.size();
}
CDistributor CModelDataReader::smartDistributorSelector(const CDistributor &distributor) const
{
CDistributorList distributors(getDistributors()); // thread safe copy
if (distributor.hasValidDbKey())
{
QString k(distributor.getDbKey());
CDistributor d(distributors.findByKey(k));
if (d.hasCompleteData()) { return d; }
// more lenient search
return distributors.findByIdOrAlias(k);
}
return CDistributor();
}
int CModelDataReader::getModelsCount() const
{
QReadLocker l(&m_lockModels);
return m_models.size();
}
bool CModelDataReader::allRead() const
bool CModelDataReader::areAllDataRead() const
{
return
getLiveriesCount() > 0 &&
getModelsCount() > 0 &&
getDistributorsCount();
getDistributorsCount() > 0;
}
void CModelDataReader::ps_read()
bool CModelDataReader::canConnect(QString &message) const
{
if (m_urlDistributors.isEmpty() || m_urlLiveries.isEmpty() || m_urlModels.isEmpty()) { return false; }
bool cm = CNetworkUtils::canConnect(m_urlModels, message);
// currently only testing one URL, might be changed in the future
return cm;
}
void CModelDataReader::ps_read(CDbFlags::Entity entity)
{
this->threadAssertCheck();
Q_ASSERT(this->m_networkManagerLivery);
@@ -86,27 +170,30 @@ namespace BlackCore
Q_ASSERT(this->m_networkManagerModel);
Q_ASSERT(!m_urlLiveries.isEmpty());
Q_ASSERT(!m_urlDistributors.isEmpty());
QNetworkRequest requestLivery(m_urlLiveries);
QNetworkRequest requestDistributor(m_urlDistributors);
QNetworkRequest requestModel(m_urlModels);
this->m_networkManagerLivery->get(requestLivery);
this->m_networkManagerDistributor->get(requestDistributor);
this->m_networkManagerModel->get(requestModel);
}
QString CModelDataReader::getLiveryUrl(const QString &protocol, const QString &server, const QString &baseUrl)
{
return buildUrl(protocol, server, baseUrl, "service/alllivery.php?rows=20000&sord=asc");
}
CDbFlags::Entity triggeredRead = CDbFlags::NoEntity;
if (entity.testFlag(CDbFlags::LiveryEntity))
{
QNetworkRequest requestLivery(m_urlLiveries);
this->m_networkManagerLivery->get(requestLivery);
triggeredRead |= CDbFlags::LiveryEntity;
}
QString CModelDataReader::getDistributorUrl(const QString &protocol, const QString &server, const QString &baseUrl)
{
return buildUrl(protocol, server, baseUrl, "service/alldistributor.php?rows=20000&sord=asc");
}
if (entity.testFlag(CDbFlags::DistributorEntity))
{
QNetworkRequest requestDistributor(m_urlDistributors);
this->m_networkManagerDistributor->get(requestDistributor);
triggeredRead |= CDbFlags::DistributorEntity;
}
QString CModelDataReader::getModelUrl(const QString &protocol, const QString &server, const QString &baseUrl)
{
return buildUrl(protocol, server, baseUrl, "service/allaircraftmodel.php?rows=20000&sord=asc");
if (entity.testFlag(CDbFlags::ModelEntity))
{
QNetworkRequest requestModel(m_urlModels);
this->m_networkManagerModel->get(requestModel);
triggeredRead |= CDbFlags::ModelEntity;
}
emit readData(triggeredRead, CDbFlags::StartRead, 0);
}
void CModelDataReader::ps_parseLiveryData(QNetworkReply *nwReplyPtr)
@@ -114,55 +201,79 @@ namespace BlackCore
// wrap pointer, make sure any exit cleans up reply
// required to use delete later as object is created in a different thread
QScopedPointer<QNetworkReply, QScopedPointerDeleteLater> nwReply(nwReplyPtr);
QJsonArray array = this->transformReplyIntoJsonArray(nwReply.data());
if (array.isEmpty()) { return; }
QJsonArray array = this->transformReplyIntoDatastoreResponse(nwReply.data());
if (array.isEmpty())
{
emit readData(CDbFlags::LiveryEntity, CDbFlags::ReadFailed, 0);
return;
}
CLiveryList liveries = CLiveryList::fromDatabaseJson(array);
// this part needs to be synchronized
int n;
int n = 0;
{
QWriteLocker wl(&this->m_lockLivery);
this->m_liveries = liveries;
n = liveries.size();
}
emit readLiveries(n);
if (allRead()) { emit readAll(); }
emit readData(CDbFlags::LiveryEntity, CDbFlags::ReadFinished, n);
}
void CModelDataReader::ps_parseDistributorData(QNetworkReply *nwReplyPtr)
{
QScopedPointer<QNetworkReply, QScopedPointerDeleteLater> nwReply(nwReplyPtr);
QJsonArray array = this->transformReplyIntoJsonArray(nwReply.data());
if (array.isEmpty()) { return; }
QJsonArray array = this->transformReplyIntoDatastoreResponse(nwReply.data());
if (array.isEmpty())
{
emit readData(CDbFlags::DistributorEntity, CDbFlags::ReadFailed, 0);
return;
}
CDistributorList distributors = CDistributorList::fromDatabaseJson(array);
// this part needs to be synchronized
int n;
int n = 0;
{
QWriteLocker wl(&this->m_lockDistributor);
this->m_distributors = distributors;
n = distributors.size();
}
emit readDistributors(n);
if (allRead()) { emit readAll(); }
emit readData(CDbFlags::DistributorEntity, CDbFlags::ReadFinished, n);
}
void CModelDataReader::ps_parseModelData(QNetworkReply *nwReplyPtr)
{
QScopedPointer<QNetworkReply, QScopedPointerDeleteLater> nwReply(nwReplyPtr);
QJsonArray array = this->transformReplyIntoJsonArray(nwReply.data());
if (array.isEmpty()) { return; }
QJsonArray array = this->transformReplyIntoDatastoreResponse(nwReply.data());
if (array.isEmpty())
{
emit readData(CDbFlags::ModelEntity, CDbFlags::ReadFailed, 0);
return;
}
CAircraftModelList models = CAircraftModelList::fromDatabaseJson(array);
// this part needs to be synchronized
int n;
int n = 0;
{
QWriteLocker wl(&this->m_lockModels);
this->m_models = models;
n = models.size();
}
emit readModels(n);
if (allRead()) { emit readAll(); }
emit readData(CDbFlags::ModelEntity, CDbFlags::ReadFinished, n);
}
QString CModelDataReader::getLiveryUrl(const QString &protocol, const QString &server, const QString &baseUrl)
{
return CNetworkUtils::buildUrl(protocol, server, baseUrl, "service/jsonlivery.php");
}
QString CModelDataReader::getDistributorUrl(const QString &protocol, const QString &server, const QString &baseUrl)
{
return CNetworkUtils::buildUrl(protocol, server, baseUrl, "service/jsondistributor.php");
}
QString CModelDataReader::getModelUrl(const QString &protocol, const QString &server, const QString &baseUrl)
{
return CNetworkUtils::buildUrl(protocol, server, baseUrl, "service/jsonaircraftmodel.php");
}
} // namespace