From 8a1811c5129a55affe2e9080759b6d7e20e182bd Mon Sep 17 00:00:00 2001
From: Lars Toenning <dev@ltoenning.de>
Date: Wed, 4 Jun 2025 20:56:59 +0200
Subject: [PATCH] fix: Only emit base URL when emitting for multiple URLs

Fixes #262
---
 src/core/db/icaodatareader.cpp  | 11 +++++------
 src/core/db/modeldatareader.cpp | 10 ++++------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/core/db/icaodatareader.cpp b/src/core/db/icaodatareader.cpp
index bb341b1da..44551abb8 100644
--- a/src/core/db/icaodatareader.cpp
+++ b/src/core/db/icaodatareader.cpp
@@ -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));
         }
     }
 
diff --git a/src/core/db/modeldatareader.cpp b/src/core/db/modeldatareader.cpp
index 1609d9165..bc48ef1e7 100644
--- a/src/core/db/modeldatareader.cpp
+++ b/src/core/db/modeldatareader.cpp
@@ -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));
         }
     }