mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-05 01:05:34 +08:00
Ref T149, use URL log to log network access in threaded reader classes
* added getFromNetworkAndLog * adjusted DB reader * adjusted other readers
This commit is contained in:
committed by
Mathew Sutcliffe
parent
1c57ce87a2
commit
b9760b4c60
@@ -236,7 +236,7 @@ namespace BlackCore
|
||||
if (!url.isEmpty())
|
||||
{
|
||||
url.appendQuery(queryLatestTimestamp(newerThan));
|
||||
sApp->getFromNetwork(url, { this, &CAirportDataReader::ps_parseAirportData });
|
||||
this->getFromNetworkAndLog(url, { this, &CAirportDataReader::ps_parseAirportData });
|
||||
emit dataRead(CEntityFlags::AirportEntity, CEntityFlags::StartRead, 0);
|
||||
}
|
||||
else
|
||||
|
||||
@@ -592,6 +592,7 @@ namespace BlackCore
|
||||
Q_ASSERT_X(nwReply, Q_FUNC_INFO, "Missing network reply");
|
||||
if (nwReply && nwReply->isFinished())
|
||||
{
|
||||
this->logNetworkReplyReceived(nwReply);
|
||||
this->setReplyStatus(nwReply->error(), nwReply->errorString());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -147,7 +147,7 @@ namespace BlackCore
|
||||
if (!url.isEmpty())
|
||||
{
|
||||
url.appendQuery(queryLatestTimestamp(newerThan));
|
||||
sApp->getFromNetwork(url, { this, &CIcaoDataReader::ps_parseAircraftIcaoData });
|
||||
this->getFromNetworkAndLog(url, { this, &CIcaoDataReader::ps_parseAircraftIcaoData });
|
||||
entitiesTriggered |= CEntityFlags::AircraftIcaoEntity;
|
||||
}
|
||||
else
|
||||
@@ -162,7 +162,7 @@ namespace BlackCore
|
||||
if (!url.isEmpty())
|
||||
{
|
||||
url.appendQuery(queryLatestTimestamp(newerThan));
|
||||
sApp->getFromNetwork(url, { this, &CIcaoDataReader::ps_parseAirlineIcaoData });
|
||||
this->getFromNetworkAndLog(url, { this, &CIcaoDataReader::ps_parseAirlineIcaoData });
|
||||
entitiesTriggered |= CEntityFlags::AirlineIcaoEntity;
|
||||
}
|
||||
else
|
||||
@@ -177,7 +177,7 @@ namespace BlackCore
|
||||
if (!url.isEmpty())
|
||||
{
|
||||
url.appendQuery(queryLatestTimestamp(newerThan));
|
||||
sApp->getFromNetwork(url, { this, &CIcaoDataReader::ps_parseCountryData });
|
||||
this->getFromNetworkAndLog(url, { this, &CIcaoDataReader::ps_parseCountryData });
|
||||
entitiesTriggered |= CEntityFlags::CountryEntity;
|
||||
}
|
||||
else
|
||||
|
||||
@@ -116,7 +116,7 @@ namespace BlackCore
|
||||
const CUrl url(this->getInfoObjectsUrl());
|
||||
if (!url.isEmpty())
|
||||
{
|
||||
sApp->getFromNetwork(url, { this, &CInfoDataReader::parseInfoObjectsData});
|
||||
this->getFromNetworkAndLog(url, { this, &CInfoDataReader::parseInfoObjectsData});
|
||||
emit dataRead(this->getEntityForMode(), CEntityFlags::StartRead, 0);
|
||||
}
|
||||
else
|
||||
|
||||
@@ -174,7 +174,7 @@ namespace BlackCore
|
||||
if (!url.isEmpty())
|
||||
{
|
||||
url.appendQuery(queryLatestTimestamp(newerThan));
|
||||
sApp->getFromNetwork(url, { this, &CModelDataReader::ps_parseLiveryData});
|
||||
this->getFromNetworkAndLog(url, { this, &CModelDataReader::ps_parseLiveryData});
|
||||
triggeredRead |= CEntityFlags::LiveryEntity;
|
||||
}
|
||||
else
|
||||
@@ -189,7 +189,7 @@ namespace BlackCore
|
||||
if (!url.isEmpty())
|
||||
{
|
||||
url.appendQuery(queryLatestTimestamp(newerThan));
|
||||
sApp->getFromNetwork(url, { this, &CModelDataReader::ps_parseDistributorData});
|
||||
this->getFromNetworkAndLog(url, { this, &CModelDataReader::ps_parseDistributorData});
|
||||
triggeredRead |= CEntityFlags::DistributorEntity;
|
||||
}
|
||||
else
|
||||
@@ -204,7 +204,7 @@ namespace BlackCore
|
||||
if (!url.isEmpty())
|
||||
{
|
||||
url.appendQuery(queryLatestTimestamp(newerThan));
|
||||
sApp->getFromNetwork(url, { this, &CModelDataReader::ps_parseModelData});
|
||||
this->getFromNetworkAndLog(url, { this, &CModelDataReader::ps_parseModelData});
|
||||
triggeredRead |= CEntityFlags::ModelEntity;
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user