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

Ref T28, consolidated reading

Browse Source 
* fixed newer parameter
* unified handling of incremental updates
* skip cache update when there was no incremental data
This commit is contained in:
Klaus Basan
2017-05-04 01:55:59 +02:00
committed by Mathew Sutcliffe
parent c0320609b3
commit 9f4f06a436
5 changed files with 92 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,11 +166,7 @@ namespace BlackCore
CUrl url(getLiveryUrl(mode));
if (!url.isEmpty())
{
if (!newerThan.isNull())
{
const QString tss(newerThan.toString(Qt::ISODate));
url.appendQuery(QString(parameterLatestTimestamp() + "=" + tss));
}
url.appendQuery(queryLatestTimestamp(newerThan));
sApp->getFromNetwork(url, { this, &CModelDataReader::ps_parseLiveryData});
triggeredRead |= CEntityFlags::LiveryEntity;
}
@@ -185,11 +181,7 @@ namespace BlackCore
CUrl url(getDistributorUrl(mode));
if (!url.isEmpty())
{
if (!newerThan.isNull())
{
const QString tss(newerThan.toString(Qt::ISODate));
url.appendQuery(QString(parameterLatestTimestamp() + "=" + tss));
}
url.appendQuery(queryLatestTimestamp(newerThan));
sApp->getFromNetwork(url, { this, &CModelDataReader::ps_parseDistributorData});
triggeredRead |= CEntityFlags::DistributorEntity;
}
@@ -204,11 +196,7 @@ namespace BlackCore
CUrl url(getModelUrl(mode));
if (!url.isEmpty())
{
if (!newerThan.isNull())
{
const QString tss(newerThan.toString(Qt::ISODate));
url.appendQuery(QString(parameterLatestTimestamp() + "=" + tss));
}
url.appendQuery(queryLatestTimestamp(newerThan));
sApp->getFromNetwork(url, { this, &CModelDataReader::ps_parseModelData});
triggeredRead |= CEntityFlags::ModelEntity;
}
@@ -274,8 +262,10 @@ namespace BlackCore
if (res.isRestricted())
{
// create full list if it was just incremental
const CLiveryList incLiveries(CLiveryList::fromDatabaseJson(res));
if (incLiveries.isEmpty()) { return; } // currenty ignored
liveries = this->getLiveries();
liveries.replaceOrAddObjectsByKey(CLiveryList::fromDatabaseJson(res));
liveries.replaceOrAddObjectsByKey(incLiveries);
}
else
{
@@ -314,8 +304,10 @@ namespace BlackCore
if (res.isRestricted())
{
// create full list if it was just incremental
const CDistributorList incDistributors(CDistributorList::fromDatabaseJson(res));
if (incDistributors.isEmpty()) { return; } // currently ignored
distributors = this->getDistributors();
distributors.replaceOrAddObjectsByKey(CDistributorList::fromDatabaseJson(res));
distributors.replaceOrAddObjectsByKey(incDistributors);
}
else
{
@@ -354,8 +346,10 @@ namespace BlackCore
if (res.isRestricted())
{
// create full list if it was just incremental
const CAircraftModelList incModels(CAircraftModelList::fromDatabaseJson(res));
if (incModels.isEmpty()) { return; } // currently ignored
models = this->getModels();
models.replaceOrAddObjectsByKey(CAircraftModelList::fromDatabaseJson(res));
models.replaceOrAddObjectsByKey(incModels);
}
else
{