From 427da3cb90e4ef13d7b69b4644bdbf6201d8572a Mon Sep 17 00:00:00 2001 From: Alexei Kotov Date: Wed, 18 Mar 2026 01:52:49 +0300 Subject: [PATCH] Wizard: Mostly uncursify data directory handling (#8999) Avoid shoving every single directory in the config file Avoid duplicates caused by mismatches between the canonical path with forward slash separator and the absolute path with native separators Give up on the broken attempt to move the path to the end of the list and clean up the essentially dead code --- apps/wizard/conclusionpage.cpp | 6 ----- apps/wizard/mainwizard.cpp | 35 ++++++++++++++---------------- components/config/gamesettings.hpp | 18 --------------- 3 files changed, 16 insertions(+), 43 deletions(-) diff --git a/apps/wizard/conclusionpage.cpp b/apps/wizard/conclusionpage.cpp index 5554e2d2fb..d12a63030d 100644 --- a/apps/wizard/conclusionpage.cpp +++ b/apps/wizard/conclusionpage.cpp @@ -16,12 +16,6 @@ Wizard::ConclusionPage::ConclusionPage(QWidget* parent) void Wizard::ConclusionPage::initializePage() { const bool retailDisc = field(QStringLiteral("installation.retailDisc")).toBool(); - // Write the path to openmw.cfg - if (retailDisc) - { - const QString path(field(QStringLiteral("installation.path")).toString()); - mWizard->addInstallation(path); - } if (!mWizard->mError) { diff --git a/apps/wizard/mainwizard.cpp b/apps/wizard/mainwizard.cpp index 5a8b554c3d..2392bb31e8 100644 --- a/apps/wizard/mainwizard.cpp +++ b/apps/wizard/mainwizard.cpp @@ -175,8 +175,6 @@ void Wizard::MainWizard::setupInstallations() void Wizard::MainWizard::runSettingsImporter() { - writeSettings(); - const QString path(field(QStringLiteral("installation.path")).toString()); const bool retailDisc(field(QStringLiteral("installation.retailDisc")).toBool()); @@ -231,7 +229,10 @@ void Wizard::MainWizard::runSettingsImporter() void Wizard::MainWizard::addInstallation(const QString& path) { - qDebug() << "add installation in: " << path; + QDir dir(path); + if (!dir.exists()) + return; + Installation install; install.hasMorrowind = findFiles(QStringLiteral("Morrowind"), path); @@ -241,21 +242,14 @@ void Wizard::MainWizard::addInstallation(const QString& path) // Try to autodetect the Morrowind.ini location // The installation path is the Data Files directory, // so the INI should be located in the parent directory. - QDir dir(path); - dir.cdUp(); - const QFile file(dir.filePath(QStringLiteral("Morrowind.ini"))); - if (file.exists()) - install.iniPath = file.fileName(); + if (dir.cdUp()) + { + const QFile file(dir.filePath(QStringLiteral("Morrowind.ini"))); + if (file.exists()) + install.iniPath = file.fileName(); + } mInstallations.insert(QDir::toNativeSeparators(path), install); - - // Add it to the openmw.cfg too - const auto& dataDirs = mGameSettings.getDataDirs(); - if (std::none_of(dataDirs.begin(), dataDirs.end(), [&](const Config::SettingValue& d) { return d.value == path; })) - { - mGameSettings.setMultiValue(QStringLiteral("data"), { path }); - mGameSettings.addDataDir({ path }); - } } void Wizard::MainWizard::setupPages() @@ -318,10 +312,13 @@ void Wizard::MainWizard::writeSettings() // Write the installation path so that openmw can find them const QString path(field(QStringLiteral("installation.path")).toString()); + const QList dirs = mGameSettings.getDataDirs(); - // Make sure the installation path is the last data= entry - mGameSettings.removeDataDir(path); - mGameSettings.addDataDir({ path }); + const QString canonical = QDir(path).canonicalPath(); + + // Don't write the path if it was already in the file + if (std::none_of(dirs.begin(), dirs.end(), [&](const Config::SettingValue& dir) { return dir.value == canonical; })) + mGameSettings.setMultiValue(QStringLiteral("data"), { path }); // Game settings QFile file(Files::getUserConfigPathQString(mCfgMgr)); diff --git a/components/config/gamesettings.hpp b/components/config/gamesettings.hpp index 4b66e6e8e5..761df4ca6b 100644 --- a/components/config/gamesettings.hpp +++ b/components/config/gamesettings.hpp @@ -77,24 +77,6 @@ namespace Config QString getResourcesVfs() const; - inline void removeDataDir(const QString& existingDir) - { - if (!existingDir.isEmpty()) - { - // non-user settings can't be removed as we can't edit the openmw.cfg they're in - mDataDirs.erase( - std::remove_if(mDataDirs.begin(), mDataDirs.end(), - [&](const SettingValue& dir) { return isUserSetting(dir) && dir.value == existingDir; }), - mDataDirs.end()); - } - } - - inline void addDataDir(const SettingValue& dir) - { - if (!dir.value.isEmpty()) - mDataDirs.append(dir); - } - inline QString getDataLocal() const { return mDataLocal; } bool hasMaster();