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

Ref T472, use cross-reader (other reader) objects to avoid unnecessary parsing

Browse Source
This commit is contained in:
Klaus Basan
2019-02-19 23:58:32 +01:00
committed by Mat Sutcliffe
parent d5aaf24231
commit 10fff29f97
2 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/blackcore/db/modeldatareader.cpp
View File

@@ -274,6 +274,18 @@ namespace BlackCore
} }
} }
CAircraftIcaoCodeList CModelDataReader::getAircraftAircraftIcaos() const
{
if (!sApp || sApp->isShuttingDown() || !sApp->getWebDataServices()) { return CAircraftIcaoCodeList(); }
return sApp->getWebDataServices()->getAircraftIcaoCodes();
}
CAircraftCategoryList CModelDataReader::getAircraftCategories() const
{
if (!sApp || sApp->isShuttingDown() || !sApp->getWebDataServices()) { return CAircraftCategoryList(); }
return sApp->getWebDataServices()->getAircraftCategories();
}
void CModelDataReader::parseLiveryData(QNetworkReply *nwReplyPtr) void CModelDataReader::parseLiveryData(QNetworkReply *nwReplyPtr)
{ {
// wrap pointer, make sure any exit cleans up reply // wrap pointer, make sure any exit cleans up reply
@@ -387,11 +399,20 @@ namespace BlackCore
// get all or incremental set of models // get all or incremental set of models
emit this->dataRead(CEntityFlags::ModelEntity, CEntityFlags::ReadParsing, 0); emit this->dataRead(CEntityFlags::ModelEntity, CEntityFlags::ReadParsing, 0);
// use prefilled data:
// this saves a lot of parsing time as the models do not need to re-parse the sub parts
// but can use objects directly
const CAircraftCategoryList categories = this->getAircraftCategories();
const CLiveryList liveries = this->getLiveries();
const CAircraftIcaoCodeList icaos = this->getAircraftAircraftIcaos();
const CDistributorList distributors = this->getDistributors();
CAircraftModelList models; CAircraftModelList models;
if (res.isRestricted()) if (res.isRestricted())
{ {
// create full list if it was just incremental // create full list if it was just incremental
const CAircraftModelList incrementalModels(CAircraftModelList::fromDatabaseJsonCaching(res)); const CAircraftModelList incrementalModels(CAircraftModelList::fromDatabaseJsonCaching(res, icaos, categories, liveries, distributors));
if (incrementalModels.isEmpty()) { return; } // currently ignored if (incrementalModels.isEmpty()) { return; } // currently ignored
models = this->getModels(); models = this->getModels();
models.replaceOrAddObjectsByKey(incrementalModels); models.replaceOrAddObjectsByKey(incrementalModels);
@@ -400,7 +421,7 @@ namespace BlackCore
{ {
QTime time; QTime time;
time.start(); time.start();
models = CAircraftModelList::fromDatabaseJsonCaching(res); models = CAircraftModelList::fromDatabaseJsonCaching(res, icaos, categories, liveries, distributors);
this->logParseMessage("models", models.size(), time.elapsed(), res); this->logParseMessage("models", models.size(), time.elapsed(), res);
} }
@@ -572,22 +593,22 @@ namespace BlackCore
if (!directory.exists()) { return false; } if (!directory.exists()) { return false; }
if (this->getLiveriesCount() > 0) if (this->getLiveriesCount() > 0)
{ {
QString json(QJsonDocument(this->getLiveries().toJson()).toJson()); const QString json(QJsonDocument(this->getLiveries().toJson()).toJson());
bool s = CFileUtils::writeStringToFileInBackground(json, CFileUtils::appendFilePaths(directory.absolutePath(), "liveries.json")); const bool s = CFileUtils::writeStringToFileInBackground(json, CFileUtils::appendFilePaths(directory.absolutePath(), "liveries.json"));
if (!s) { return false; } if (!s) { return false; }
} }
if (this->getModelsCount() > 0) if (this->getModelsCount() > 0)
{ {
QString json(QJsonDocument(this->getModels().toJson()).toJson()); const QString json(QJsonDocument(this->getModels().toJson()).toJson());
bool s = CFileUtils::writeStringToFileInBackground(json, CFileUtils::appendFilePaths(directory.absolutePath(), "models.json")); const bool s = CFileUtils::writeStringToFileInBackground(json, CFileUtils::appendFilePaths(directory.absolutePath(), "models.json"));
if (!s) { return false; } if (!s) { return false; }
} }
if (this->getDistributorsCount() > 0) if (this->getDistributorsCount() > 0)
{ {
QString json(QJsonDocument(this->getDistributors().toJson()).toJson()); const QString json(QJsonDocument(this->getDistributors().toJson()).toJson());
bool s = CFileUtils::writeStringToFileInBackground(json, CFileUtils::appendFilePaths(directory.absolutePath(), "distributors.json")); const bool s = CFileUtils::writeStringToFileInBackground(json, CFileUtils::appendFilePaths(directory.absolutePath(), "distributors.json"));
if (!s) { return false; } if (!s) { return false; }
} }
return true; return true;

8
src/blackcore/db/modeldatareader.h
View File

@@ -191,6 +191,14 @@ namespace BlackCore
//! Update reader URL //! Update reader URL
void updateReaderUrl(const BlackMisc::Network::CUrl &url); void updateReaderUrl(const BlackMisc::Network::CUrl &url);
//! Get ICAO codes
//! \remark cross reader access
BlackMisc::Aviation::CAircraftIcaoCodeList getAircraftAircraftIcaos() const;
//! Get categories
//! \remark cross reader access
BlackMisc::Aviation::CAircraftCategoryList getAircraftCategories() const;
//! URL livery web service //! URL livery web service
BlackMisc::Network::CUrl getLiveryUrl(BlackMisc::Db::CDbFlags::DataRetrievalModeFlag mode) const; BlackMisc::Network::CUrl getLiveryUrl(BlackMisc::Db::CDbFlags::DataRetrievalModeFlag mode) const;