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

refs #748 Support database format in CAirportDataReader

Browse Source 
* CAirport is now database object
* CAirportList is now datastore object list
* CAirportDataReader adjustments
This commit is contained in:
Michał Garapich
2016-09-16 01:36:07 +02:00
committed by Mathew Sutcliffe
parent a4b5b28cc1
commit cf3e9f1f67
11 changed files with 98 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
src/blackcore/db/airportdatareader.cpp
View File

@@ -27,13 +27,6 @@ namespace BlackCore
// void
}
void CAirportDataReader::readInBackgroundThread()
{
bool s = QMetaObject::invokeMethod(this, "ps_readAirports");
Q_ASSERT_X(s, Q_FUNC_INFO, "Cannot invoke ");
Q_UNUSED(s);
}
BlackMisc::Aviation::CAirportList CAirportDataReader::getAirports() const
{
return m_airportCache.get();
@@ -61,79 +54,74 @@ namespace BlackCore
bool CAirportDataReader::hasChangedUrl(CEntityFlags::Entity entity) const
{
// TODO
return false;
Q_UNUSED(entity);
return CDatabaseReader::isChangedUrl(this->m_readerUrlCache.get(), this->getAirportsUrl());
}
CUrl CAirportDataReader::getAirportsUrl() const
{
const CUrl url(sApp->getGlobalSetup().getSwiftAirportUrls().getRandomWorkingUrl());
return url;
return sApp->getGlobalSetup().getDbRootDirectoryUrl().withAppendedPath("service/jsonairport.php");
}
void CAirportDataReader::ps_parseAirportData(QNetworkReply *nwReply)
{
QJsonParseError error;
QByteArray data = nwReply->readAll();
QJsonDocument document = QJsonDocument::fromJson(data, &error);
if (error.error != QJsonParseError::NoError)
CDatabaseReader::JsonDatastoreResponse res = this->setStatusAndTransformReplyIntoDatastoreResponse(nwReply);
if (res.hasErrorMessage())
{
CLogMessage(this).error("Error parsing airport list from JSON (%1)") << error.errorString();
return;
}
QJsonArray array = document.array();
if (array.isEmpty())
{
CLogMessage(this).error("Error parsing airport list from JSON (document is not an array)");
CLogMessage::preformatted(res.lastWarningOrAbove());
emit dataRead(CEntityFlags::AirportEntity, CEntityFlags::ReadFailed, 0);
return;
}
CAirportList airports;
airports.convertFromDatabaseJson(array);
quint64 timestamp = lastModifiedMsSinceEpoch(nwReply);
if (res.isRestricted())
{
QWriteLocker wl(&this->m_lock);
m_airportCache.set(airports, timestamp);
airports = this->getAirports();
CAirportList updates;
updates.convertFromDatabaseJson(res);
airports.replaceOrAddObjectsByKey(updates);
}
else
{
airports.convertFromDatabaseJson(res);
}
int size = airports.size();
qint64 timestamp = lastModifiedMsSinceEpoch(nwReply);
if (size > 0 && timestamp < 0)
{
CLogMessage(this).error("No timestamp in airport list, setting to last modified value");
timestamp = lastModifiedMsSinceEpoch(nwReply);
}
m_airportCache.set(airports, timestamp);
emit dataRead(CEntityFlags::AirportEntity, CEntityFlags::ReadFinished, airports.size());
}
void CAirportDataReader::ps_parseAirportHeader(QNetworkReply *nwReply)
void CAirportDataReader::ps_read(CEntityFlags::Entity entity, const QDateTime &newerThan)
{
this->threadAssertCheck();
m_lastModified = lastModifiedMsSinceEpoch(nwReply);
ps_readAirports();
}
if (this->isAbandoned()) { return; }
void CAirportDataReader::ps_readAirports()
{
this->threadAssertCheck();
Q_ASSERT_X(sApp, Q_FUNC_INFO, "No Application");
CFailoverUrlList urls(sApp->getGlobalSetup().getSwiftAirportUrls());
const CUrl url(urls.obtainNextWorkingUrl(true));
if (url.isEmpty()) { return; }
if (0 == m_lastModified) {
sApp->headerFromNetwork(url, { this, &CAirportDataReader::ps_parseAirportHeader });
return;
}
m_airportCache.synchronize();
int size = m_airportCache.get().size();
if (size > 0 &&
m_airportCache.getAvailableTimestamp().toMSecsSinceEpoch() >= static_cast<qint64>(m_lastModified)) // cache is up-to-date
if (entity.testFlag(CEntityFlags::AirportEntity))
{
CLogMessage(this).info("Loaded %1 airports from cache") << m_airportCache.get().size();
emit dataRead(CEntityFlags::AirportEntity, CEntityFlags::ReadFinished, size);
}
else
{
sApp->getFromNetwork(url, { this, &CAirportDataReader::ps_parseAirportData });
CUrl url = getAirportsUrl();
if (!url.isEmpty())
{
if (!newerThan.isNull())
{
const QString tss(newerThan.toString(Qt::ISODate));
url.appendQuery(QString(parameterLatestTimestamp() + "=" + tss));
}
sApp->getFromNetwork(url, { this, &CAirportDataReader::ps_parseAirportData });
emit dataRead(CEntityFlags::AirportEntity, CEntityFlags::StartRead, 0);
}
else
{
CLogMessage(this).error("No URL for %1") << CEntityFlags::flagToString(CEntityFlags::AirportEntity);
}
}
}
@@ -141,5 +129,10 @@ namespace BlackCore
{
// void
}
void CAirportDataReader::ps_baseUrlCacheChanged()
{
// void
}
} // ns
} // ns

18
src/blackcore/db/airportdatareader.h
View File

@@ -38,9 +38,6 @@ namespace BlackCore
//! Constructor
CAirportDataReader(QObject* parent, const CDatabaseReaderConfigList &config);
//! Read airports
void readInBackgroundThread();
//! Returns a list of all airports in the database.
//! \threadsafe
BlackMisc::Aviation::CAirportList getAirports() const;
@@ -69,19 +66,20 @@ namespace BlackCore
//! Parse downloaded JSON file
void ps_parseAirportData(QNetworkReply *nwReply);
//! Read Last-Modified header
void ps_parseAirportHeader(QNetworkReply *nwReply);
//! Read airports
void ps_readAirports();
//! Read / re-read data file
void ps_read(BlackMisc::Network::CEntityFlags::Entity entity = BlackMisc::Network::CEntityFlags::DistributorLiveryModel, const QDateTime &newerThan = QDateTime());
//! Airport cache changed
void ps_airportCacheChanged();
//! Base url cache changed
void ps_baseUrlCacheChanged();
private:
BlackMisc::CData<BlackCore::Data::TDbAirportCache> m_airportCache {this, &CAirportDataReader::ps_airportCacheChanged};
mutable QReadWriteLock m_lock;
quint64 m_lastModified = 0; //!< When was data file updated, obtained from HTTP Last-Modified header, in ms from epoch
//! Reader URL (we read from where?) used to detect changes of location
BlackMisc::CData<BlackCore::Data::TDbModelReaderBaseUrl> m_readerUrlCache {this, &CAirportDataReader::ps_baseUrlCacheChanged };
};
}