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

refactor: Move installer flag handling to launcher

Browse Source 
This is only used by the launcher
This commit is contained in:
Lars Toenning
2024-02-15 23:01:00 +01:00
parent a84e299e45
commit a664371567
5 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/swiftlauncher/main.cpp
View File

@@ -6,6 +6,7 @@
#include "blackcore/db/databasereaderconfig.h"
#include "blackmisc/directoryutils.h"
#include "blackmisc/icons.h"
#include "blackcore/webdataservices.h"
#include <QtGlobal>
#include <QApplication>
@@ -17,6 +18,21 @@ using namespace BlackMisc;
using namespace BlackCore;
using namespace BlackCore::Db;
//! Init the DB cache from local resource files if the cache has no timestamp or the cache was not updated since 2 years
void initDbCacheFromResourceFileIfRequired(CGuiApplication &a)
{
Q_ASSERT_X(a.hasWebDataServices(), Q_FUNC_INFO, "Requires web services");
CWebDataServices *webDataServices = a.getWebDataServices();
// caches from local files (i.e. the files delivered)
const QDateTime ts = webDataServices->getLatestDbEntityCacheTimestamp();
if (!ts.isValid() || ts < QDateTime::currentDateTimeUtc().addYears(-2))
{
webDataServices->initDbCachesFromLocalResourceFiles(false);
}
}
int main(int argc, char *argv[])
{
CGuiApplication::highDpiScreenSupport(CGuiApplication::scaleFactor(argc, argv));
@@ -24,9 +40,14 @@ int main(int argc, char *argv[])
Q_UNUSED(qa)
CGuiApplication a(CApplicationInfo::swiftLauncher(), CApplicationInfo::Laucher, CIcons::swiftLauncher1024());
a.addVatlibOptions(); // so it can be passed (hand over) to started applications
a.addParserOption({ { "i", "installer" }, QCoreApplication::translate("main", "Installer setup.") });
const QCommandLineOption installerOption { { "i", "installer" }, QCoreApplication::translate("main", "Installer setup.") };
a.addParserOption(installerOption);
if (!a.parseCommandLineArgsAndLoadSetup()) { return EXIT_FAILURE; }
a.useWebDataServices(BlackCore::CWebReaderFlags::AllSwiftDbReaders, CDatabaseReaderConfigList::forLauncher());
const bool installMode = a.isParserOptionSet(installerOption);
if (installMode) initDbCacheFromResourceFileIfRequired(a);
a.useFacadeNoContexts();
if (!a.start())
{
@@ -34,7 +55,7 @@ int main(int argc, char *argv[])
return EXIT_FAILURE;
}
CSwiftLauncher launcher;
CSwiftLauncher launcher(installMode);
const int res = a.exec();
if (res != EXIT_SUCCESS || !launcher.shouldStartAppDetached())
{