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 #748, airport JSON reader bug in changed URL fixed (URL was always flagged as changed)

Browse Source 
In same step some code cleanup
This commit is contained in:
Klaus Basan
2016-10-24 03:29:15 +02:00
parent b87a3dffaa
commit 6a8c8c8889
4 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -282,7 +282,7 @@ namespace BlackCore
latestTimestamp = lastModifiedMsSinceEpoch(nwReply.data());
}
this->m_liveryCache.set(liveries, latestTimestamp);
this->updateReaderUrl(this->getBaseUrl());
this->updateReaderUrl(getBaseUrl());
// never emit when lock is held -> deadlock
emit dataRead(CEntityFlags::LiveryEntity, res.isRestricted() ? CEntityFlags::ReadFinishedRestricted : CEntityFlags::ReadFinished, n);
@@ -325,7 +325,7 @@ namespace BlackCore
latestTimestamp = lastModifiedMsSinceEpoch(nwReply.data());
}
this->m_distributorCache.set(distributors, latestTimestamp);
this->updateReaderUrl(this->getBaseUrl());
this->updateReaderUrl(getBaseUrl());
emit dataRead(CEntityFlags::DistributorEntity, res.isRestricted() ? CEntityFlags::ReadFinishedRestricted : CEntityFlags::ReadFinished, n);
CLogMessage(this).info("Read %1 %2 from %3") << n << CEntityFlags::flagToString(CEntityFlags::DistributorEntity) << urlString;
@@ -368,7 +368,7 @@ namespace BlackCore
latestTimestamp = lastModifiedMsSinceEpoch(nwReply.data());
}
this->m_modelCache.set(models, latestTimestamp);
this->updateReaderUrl(this->getBaseUrl());
this->updateReaderUrl(getBaseUrl());
emit dataRead(CEntityFlags::ModelEntity, res.isRestricted() ? CEntityFlags::ReadFinishedRestricted : CEntityFlags::ReadFinished, n);
CLogMessage(this).info("Read %1 %2 from %3") << n << CEntityFlags::flagToString(CEntityFlags::ModelEntity) << urlString;
@@ -505,7 +505,7 @@ namespace BlackCore
bool CModelDataReader::hasChangedUrl(CEntityFlags::Entity entity) const
{
Q_UNUSED(entity);
return CDatabaseReader::isChangedUrl(this->m_readerUrlCache.get(), this->getBaseUrl());
return CDatabaseReader::isChangedUrl(this->m_readerUrlCache.get(), getBaseUrl());
}
const CUrl &CModelDataReader::getBaseUrl()