diff --git a/src/blackcore/webdataservices.cpp b/src/blackcore/webdataservices.cpp index 93b151bd6..504634e5c 100644 --- a/src/blackcore/webdataservices.cpp +++ b/src/blackcore/webdataservices.cpp @@ -175,16 +175,9 @@ namespace BlackCore return (this->getModelsCount() > 0) && (this->getLiveriesCount() > 0) && (this->getDistributorsCount() > 0) && (this->getAircraftIcaoCodesCount() > 0); } - void CWebDataServices::synchronizeDbCaches(CEntityFlags::Entity entities) - { - if (this->m_infoDataReader) { this->m_infoDataReader->synchronizeCaches(entities); } - if (this->m_modelDataReader) { this->m_modelDataReader->synchronizeCaches(entities); } - if (this->m_icaoDataReader) { this->m_icaoDataReader->synchronizeCaches(entities); } - if (this->m_airportDataReader) { this->m_airportDataReader->synchronizeCaches(entities); } - } - void CWebDataServices::admitDbCaches(CEntityFlags::Entity entities) { + // hint: all the readers use own threads if (this->m_infoDataReader) { this->m_infoDataReader->admitCaches(entities); } if (this->m_modelDataReader) { this->m_modelDataReader->admitCaches(entities); } if (this->m_icaoDataReader) { this->m_icaoDataReader->admitCaches(entities); } diff --git a/src/blackcore/webdataservices.h b/src/blackcore/webdataservices.h index 701c271cf..9413f9d72 100644 --- a/src/blackcore/webdataservices.h +++ b/src/blackcore/webdataservices.h @@ -349,9 +349,6 @@ namespace BlackCore //! All DB data for an aircraft entity available? bool hasDbAircraftData() const; - //! Synchronize all DB caches - void synchronizeDbCaches(BlackMisc::Network::CEntityFlags::Entity entities); - //! Admit all DB caches void admitDbCaches(BlackMisc::Network::CEntityFlags::Entity entities); diff --git a/src/blackgui/components/dbloadoverviewcomponent.cpp b/src/blackgui/components/dbloadoverviewcomponent.cpp index 56be89cc2..1767f1c83 100644 --- a/src/blackgui/components/dbloadoverviewcomponent.cpp +++ b/src/blackgui/components/dbloadoverviewcomponent.cpp @@ -54,22 +54,13 @@ namespace BlackGui void CDbLoadOverviewComponent::display() { - if (this->isInitialized()) - { - this->ps_setValues(); - } - else - { - this->showLoading(); - QTimer::singleShot(1000, this, &CDbLoadOverviewComponent::ps_setValues); - } + this->ps_setValues(); } void CDbLoadOverviewComponent::ps_setValues() { if (!sGui) { return; } if (!sGui->hasWebDataServices()) { return; } - CDbLoadOverviewComponent::synchronizeCaches(); ui->le_AircraftIcaoCacheTs->setText(cacheTimestampForEntity(CEntityFlags::AircraftIcaoEntity)); ui->le_AirlinesIcaoCacheTs->setText(cacheTimestampForEntity(CEntityFlags::AirlineIcaoEntity)); @@ -186,11 +177,6 @@ namespace BlackGui return c < 0 ? "-" : QString::number(c); } - void CDbLoadOverviewComponent::synchronizeCaches() - { - sGui->getWebDataServices()->synchronizeDbCaches(CEntityFlags::AllDbEntities); - } - void CDbLoadOverviewComponent::admitCaches() { sGui->getWebDataServices()->admitDbCaches(CEntityFlags::AllDbEntities); diff --git a/src/blackgui/components/dbloadoverviewcomponent.h b/src/blackgui/components/dbloadoverviewcomponent.h index 875ef5bc2..7fc1618ba 100644 --- a/src/blackgui/components/dbloadoverviewcomponent.h +++ b/src/blackgui/components/dbloadoverviewcomponent.h @@ -69,9 +69,6 @@ namespace BlackGui //! Formatted count for entity static QString dbCountForEntity(BlackMisc::Network::CEntityFlags::Entity entity); - //! Synchronize caches - static void synchronizeCaches(); - //! Admit caches static void admitCaches();