flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Only emit base URL when emitting for multiple URLs

Browse Source 
Fixes #262
This commit is contained in:
Lars Toenning
2025-06-04 20:56:59 +02:00
parent cbbc3706c0
commit 8a1811c512
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/db/icaodatareader.cpp
View File

@@ -153,10 +153,9 @@ namespace swift::core::db
entities &= CEntityFlags::AllIcaoCountriesCategory;
CEntityFlags::Entity entitiesTriggered = CEntityFlags::NoEntity;
CUrl url;
if (entities.testFlag(CEntityFlags::AircraftIcaoEntity))
{
url = this->getAircraftIcaoUrl(mode);
CUrl url = this->getAircraftIcaoUrl(mode);
if (!url.isEmpty())
{
url.appendQuery(queryLatestTimestamp(newerThan));
@@ -168,7 +167,7 @@ namespace swift::core::db
if (entities.testFlag(CEntityFlags::AirlineIcaoEntity))
{
url = this->getAirlineIcaoUrl(mode);
CUrl url = this->getAirlineIcaoUrl(mode);
if (!url.isEmpty())
{
url.appendQuery(queryLatestTimestamp(newerThan));
@@ -180,7 +179,7 @@ namespace swift::core::db
if (entities.testFlag(CEntityFlags::CountryEntity))
{
url = this->getCountryUrl(mode);
CUrl url = this->getCountryUrl(mode);
if (!url.isEmpty())
{
url.appendQuery(queryLatestTimestamp(newerThan));
@@ -192,7 +191,7 @@ namespace swift::core::db
if (entities.testFlag(CEntityFlags::AircraftCategoryEntity))
{
url = this->getAircraftCategoryUrl(mode);
CUrl url = this->getAircraftCategoryUrl(mode);
if (!url.isEmpty())
{
url.appendQuery(queryLatestTimestamp(newerThan));
@@ -204,7 +203,7 @@ namespace swift::core::db
if (entitiesTriggered != CEntityFlags::NoEntity)
{
emit this->dataRead(entitiesTriggered, CEntityFlags::ReadStarted, 0, url);
emit this->dataRead(entitiesTriggered, CEntityFlags::ReadStarted, 0, getBaseUrl(mode));
}
}

10
src/core/db/modeldatareader.cpp
View File

@@ -167,11 +167,9 @@ namespace swift::core::db
entities &= CEntityFlags::DistributorLiveryModel;
CEntityFlags::Entity triggeredRead = CEntityFlags::NoEntity;
CUrl url;
if (entities.testFlag(CEntityFlags::LiveryEntity))
{
url = this->getLiveryUrl(mode);
CUrl url = this->getLiveryUrl(mode);
if (!url.isEmpty())
{
url.appendQuery(queryLatestTimestamp(newerThan));
@@ -183,7 +181,7 @@ namespace swift::core::db
if (entities.testFlag(CEntityFlags::DistributorEntity))
{
url = this->getDistributorUrl(mode);
CUrl url = this->getDistributorUrl(mode);
if (!url.isEmpty())
{
url.appendQuery(queryLatestTimestamp(newerThan));
@@ -195,7 +193,7 @@ namespace swift::core::db
if (entities.testFlag(CEntityFlags::ModelEntity))
{
url = this->getModelUrl(mode);
CUrl url = this->getModelUrl(mode);
if (!url.isEmpty())
{
url.appendQuery(queryLatestTimestamp(newerThan));
@@ -207,7 +205,7 @@ namespace swift::core::db
if (triggeredRead != CEntityFlags::NoEntity)
{
emit dataRead(triggeredRead, CEntityFlags::ReadStarted, 0, url);
emit dataRead(triggeredRead, CEntityFlags::ReadStarted, 0, getBaseUrl(mode));
}
}