flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-13 07:35:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Simplify getting shared data directory URL

Browse Source
This commit is contained in:
Lars Toenning
2024-04-29 21:46:23 +02:00
parent 14c045e7b4
commit 89544d1ecb
4 changed files with 6 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackcore/db/databasereader.cpp
View File

@@ -478,7 +478,7 @@ namespace BlackCore::Db
return this->getDbServiceBaseUrl().withAppendedPath("/service");
case CDbFlags::SharedInfoOnly:
case CDbFlags::Shared:
return CDatabaseReader::getSharedDbdataDirectoryUrl();
return sApp->getGlobalSetup().getSharedDbDataDirectoryUrl();
default:
qFatal("Wrong mode");
break;
@@ -693,13 +693,6 @@ namespace BlackCore::Db
return dbUrl;
}
CUrl CDatabaseReader::getSharedDbdataDirectoryUrl()
{
const CUrlList sharedUrls = sApp->getGlobalSetup().getSwiftSharedUrls();
Q_ASSERT_X(!sharedUrls.empty(), Q_FUNC_INFO, "Need at least one shared URL");
return CGlobalSetup::buildDbDataDirectoryUrl(sharedUrls[0]);
}
void CDatabaseReader::cacheHasChanged(CEntityFlags::Entity entities)
{
this->emitReadSignalPerSingleCachedEntity(entities, false);

3
src/blackcore/db/databasereader.h
View File

@@ -343,9 +343,6 @@ namespace BlackCore::Db
//! DB base URL
static const BlackMisc::Network::CUrl &getDbUrl();
//! shared "dbdata" directory URL
static BlackMisc::Network::CUrl getSharedDbdataDirectoryUrl();
//! File name for given mode, either php service or shared file name
static QString fileNameForMode(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Db::CDbFlags::DataRetrievalModeFlag mode);