|
|
|
#include "launchersettings.hpp"
|
|
|
|
|
|
|
|
#include <QDebug>
|
Store original representation of paths in content lists
Also compare against existing content lists in a more forgiving way.
The first improvement makes it possible to use relative paths in openmw.cfg without the launcher canonicalising them.
This was really annoying if you used a relative path on purpose.
It also stops the launcher converting all paths to Qt's convention, where forward slashes are used on Windows even though they're not native.
The engine doesn't care, so you could always put either in the config file, but the launcher wouldn't stand for that, and would make them match.
To make this work, we need to store a path's originalRepresentation in the content list, compare paths loaded from openmw.cfg based on their originalRepresentation, and convert paths from originalRepresentation to absolute value when loading them from a content list.
The second improvement means that paths that are equivalent, but expressed differently (e.g. mismatched case on Windows, mismatched separators on Windows, or mild differences like unnecessary `./`es and doubled separators) don't trigger the creation of a new effectively-identical content list.
To make this work, we had to switch the comparison to lexicaly normalise the path first.
It could only be lexical normalisation as originalRepresentation might be absolute, relative, or absolute-but-based-on-a-path-slug, and we didn't want slugs to break things or relative paths to count as equivalent to absolute ones that refer to the same file.
The comparison is case-insensitive on Windows, and case-sensitive elsewhere.
This isn't strictly right, as you can have case-sensitive things mounted on Windows or tell a Linux directory to be case-insensitive, but we can't tell when that might happen based on a lexical path as it depends on real directory properties (and might differ for different parts of the path, which is too much hassle to support).
2 months ago
|
|
|
#include <QDir>
|
|
|
|
#include <QMultiMap>
|
|
|
|
#include <QRegularExpression>
|
|
|
|
#include <QString>
|
|
|
|
#include <QStringList>
|
|
|
|
#include <QTextStream>
|
|
|
|
|
|
|
|
#include <components/debug/debuglog.hpp>
|
|
|
|
#include <components/files/qtconversion.hpp>
|
|
|
|
|
|
|
|
#include "gamesettings.hpp"
|
|
|
|
|
|
|
|
namespace Config
|
|
|
|
{
|
|
|
|
namespace
|
|
|
|
{
|
|
|
|
constexpr char sSettingsSection[] = "Settings";
|
|
|
|
constexpr char sGeneralSection[] = "General";
|
|
|
|
constexpr char sProfilesSection[] = "Profiles";
|
|
|
|
constexpr char sImporterSection[] = "Importer";
|
|
|
|
constexpr char sLanguageKey[] = "language";
|
|
|
|
constexpr char sCurrentProfileKey[] = "currentprofile";
|
|
|
|
constexpr char sDataKey[] = "data";
|
|
|
|
constexpr char sArchiveKey[] = "fallback-archive";
|
|
|
|
constexpr char sContentKey[] = "content";
|
|
|
|
constexpr char sFirstRunKey[] = "firstrun";
|
|
|
|
constexpr char sImportContentSetupKey[] = "importcontentsetup";
|
|
|
|
constexpr char sImportFontSetupKey[] = "importfontsetup";
|
|
|
|
constexpr char sMainWindowWidthKey[] = "MainWindow/width";
|
|
|
|
constexpr char sMainWindowHeightKey[] = "MainWindow/height";
|
|
|
|
constexpr char sMainWindowPosXKey[] = "MainWindow/posx";
|
|
|
|
constexpr char sMainWindowPosYKey[] = "MainWindow/posy";
|
|
|
|
|
|
|
|
QString makeNewContentListName()
|
|
|
|
{
|
|
|
|
// basically, use date and time as the name e.g. YYYY-MM-DDThh:mm:ss
|
|
|
|
const std::time_t rawtime = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
|
|
|
|
tm timeinfo{};
|
|
|
|
#ifdef _WIN32
|
|
|
|
(void)localtime_s(&timeinfo, &rawtime);
|
|
|
|
#else
|
|
|
|
(void)localtime_r(&rawtime, &timeinfo);
|
|
|
|
#endif
|
|
|
|
constexpr int base = 10;
|
|
|
|
QChar zeroPad('0');
|
|
|
|
return QString("%1-%2-%3T%4:%5:%6")
|
|
|
|
.arg(timeinfo.tm_year + 1900, 4)
|
|
|
|
.arg(timeinfo.tm_mon + 1, 2, base, zeroPad)
|
|
|
|
.arg(timeinfo.tm_mday, 2, base, zeroPad)
|
|
|
|
.arg(timeinfo.tm_hour, 2, base, zeroPad)
|
|
|
|
.arg(timeinfo.tm_min, 2, base, zeroPad)
|
|
|
|
.arg(timeinfo.tm_sec, 2, base, zeroPad);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool parseBool(const QString& value, bool& out)
|
|
|
|
{
|
|
|
|
if (value == "false")
|
|
|
|
{
|
|
|
|
out = false;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
if (value == "true")
|
|
|
|
{
|
|
|
|
out = true;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool parseInt(const QString& value, int& out)
|
|
|
|
{
|
|
|
|
bool ok = false;
|
|
|
|
const int converted = value.toInt(&ok);
|
|
|
|
if (ok)
|
|
|
|
out = converted;
|
|
|
|
return ok;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool parseProfilePart(
|
|
|
|
const QString& key, const QString& value, std::map<QString, LauncherSettings::Profile>& profiles)
|
|
|
|
{
|
|
|
|
const int separator = key.lastIndexOf('/');
|
|
|
|
if (separator == -1)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
const QString profileName = key.mid(0, separator);
|
|
|
|
|
|
|
|
if (key.endsWith(sArchiveKey))
|
|
|
|
{
|
|
|
|
profiles[profileName].mArchives.append(value);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
if (key.endsWith(sDataKey))
|
|
|
|
{
|
|
|
|
profiles[profileName].mData.append(value);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
if (key.endsWith(sContentKey))
|
|
|
|
{
|
|
|
|
profiles[profileName].mContent.append(value);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool parseSettingsSection(const QString& key, const QString& value, LauncherSettings::Settings& settings)
|
|
|
|
{
|
|
|
|
if (key == sLanguageKey)
|
|
|
|
{
|
|
|
|
settings.mLanguage = value;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool parseProfilesSection(const QString& key, const QString& value, LauncherSettings::Profiles& profiles)
|
|
|
|
{
|
|
|
|
if (key == sCurrentProfileKey)
|
|
|
|
{
|
|
|
|
profiles.mCurrentProfile = value;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return parseProfilePart(key, value, profiles.mValues);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool parseGeneralSection(const QString& key, const QString& value, LauncherSettings::General& general)
|
|
|
|
{
|
|
|
|
if (key == sFirstRunKey)
|
|
|
|
return parseBool(value, general.mFirstRun);
|
|
|
|
if (key == sMainWindowWidthKey)
|
|
|
|
return parseInt(value, general.mMainWindow.mWidth);
|
|
|
|
if (key == sMainWindowHeightKey)
|
|
|
|
return parseInt(value, general.mMainWindow.mHeight);
|
|
|
|
if (key == sMainWindowPosXKey)
|
|
|
|
return parseInt(value, general.mMainWindow.mPosX);
|
|
|
|
if (key == sMainWindowPosYKey)
|
|
|
|
return parseInt(value, general.mMainWindow.mPosY);
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool parseImporterSection(const QString& key, const QString& value, LauncherSettings::Importer& importer)
|
|
|
|
{
|
|
|
|
if (key == sImportContentSetupKey)
|
|
|
|
return parseBool(value, importer.mImportContentSetup);
|
|
|
|
if (key == sImportFontSetupKey)
|
|
|
|
return parseBool(value, importer.mImportFontSetup);
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
template <std::size_t size>
|
|
|
|
void writeSectionHeader(const char (&name)[size], QTextStream& stream)
|
|
|
|
{
|
|
|
|
stream << "\n[" << name << "]\n";
|
|
|
|
}
|
|
|
|
|
|
|
|
template <std::size_t size>
|
|
|
|
void writeKeyValue(const char (&key)[size], const QString& value, QTextStream& stream)
|
|
|
|
{
|
|
|
|
stream << key << '=' << value << '\n';
|
|
|
|
}
|
|
|
|
|
|
|
|
template <std::size_t size>
|
|
|
|
void writeKeyValue(const char (&key)[size], bool value, QTextStream& stream)
|
|
|
|
{
|
|
|
|
stream << key << '=' << (value ? "true" : "false") << '\n';
|
|
|
|
}
|
|
|
|
|
|
|
|
template <std::size_t size>
|
|
|
|
void writeKeyValue(const char (&key)[size], int value, QTextStream& stream)
|
|
|
|
{
|
|
|
|
stream << key << '=' << value << '\n';
|
|
|
|
}
|
|
|
|
|
|
|
|
template <std::size_t size>
|
|
|
|
void writeKeyValues(
|
|
|
|
const QString& prefix, const char (&suffix)[size], const QStringList& values, QTextStream& stream)
|
|
|
|
{
|
|
|
|
for (const auto& v : values)
|
|
|
|
stream << prefix << '/' << suffix << '=' << v << '\n';
|
|
|
|
}
|
|
|
|
|
|
|
|
void writeSettings(const LauncherSettings::Settings& value, QTextStream& stream)
|
|
|
|
{
|
|
|
|
writeSectionHeader(sSettingsSection, stream);
|
|
|
|
writeKeyValue(sLanguageKey, value.mLanguage, stream);
|
|
|
|
}
|
|
|
|
|
|
|
|
void writeProfiles(const LauncherSettings::Profiles& value, QTextStream& stream)
|
|
|
|
{
|
|
|
|
writeSectionHeader(sProfilesSection, stream);
|
|
|
|
writeKeyValue(sCurrentProfileKey, value.mCurrentProfile, stream);
|
|
|
|
for (auto it = value.mValues.rbegin(); it != value.mValues.rend(); ++it)
|
|
|
|
{
|
|
|
|
writeKeyValues(it->first, sArchiveKey, it->second.mArchives, stream);
|
|
|
|
writeKeyValues(it->first, sDataKey, it->second.mData, stream);
|
|
|
|
writeKeyValues(it->first, sContentKey, it->second.mContent, stream);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void writeGeneral(const LauncherSettings::General& value, QTextStream& stream)
|
|
|
|
{
|
|
|
|
writeSectionHeader(sGeneralSection, stream);
|
|
|
|
writeKeyValue(sFirstRunKey, value.mFirstRun, stream);
|
|
|
|
writeKeyValue(sMainWindowWidthKey, value.mMainWindow.mWidth, stream);
|
|
|
|
writeKeyValue(sMainWindowPosYKey, value.mMainWindow.mPosY, stream);
|
|
|
|
writeKeyValue(sMainWindowPosXKey, value.mMainWindow.mPosX, stream);
|
|
|
|
writeKeyValue(sMainWindowHeightKey, value.mMainWindow.mHeight, stream);
|
|
|
|
}
|
|
|
|
|
|
|
|
void writeImporter(const LauncherSettings::Importer& value, QTextStream& stream)
|
|
|
|
{
|
|
|
|
writeSectionHeader(sImporterSection, stream);
|
|
|
|
writeKeyValue(sImportContentSetupKey, value.mImportContentSetup, stream);
|
|
|
|
writeKeyValue(sImportFontSetupKey, value.mImportFontSetup, stream);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void Config::LauncherSettings::writeFile(QTextStream& stream) const
|
|
|
|
{
|
|
|
|
writeSettings(mSettings, stream);
|
|
|
|
writeProfiles(mProfiles, stream);
|
|
|
|
writeGeneral(mGeneral, stream);
|
|
|
|
writeImporter(mImporter, stream);
|
|
|
|
}
|
|
|
|
|
|
|
|
QStringList Config::LauncherSettings::getContentLists()
|
|
|
|
{
|
|
|
|
QStringList result;
|
|
|
|
result.reserve(mProfiles.mValues.size());
|
|
|
|
for (const auto& [k, v] : mProfiles.mValues)
|
|
|
|
result.push_back(k);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
void Config::LauncherSettings::setContentList(const GameSettings& gameSettings)
|
|
|
|
{
|
|
|
|
// obtain content list from game settings (if present)
|
Track source of settings
This one's a biggie.
The basic idea's that GameSettings should know:
* what the interpreted value of a setting is, so it can actually be used.
* what the original value the user put in their config was, so it can be put back when the config's saved.
* which path it's processing the openmw.cfg from so relative paths can be resolved correctly.
* whether a setting's a user setting that can be modified, or from one of the other openmw.cfg files that can't necessarily be modified.
This had fairly wide-reaching implications.
The first is that paths are resolved properly in cases where they previously wouldn't have been.
Without this commit, if the launcher saw a relative path in an openmw.cfg, it'd be resolved relative to the process' working directory (which we always set to the binary directory for reasons I won't get into).
That's not what the engine does, so is bad.
It's also not something a user's likely to suspect.
This mess is no longer a problem as paths are resolved correctly when they're loaded instead of on demand when they're used by whatever uses them.
Another problem was that if paths used slugs like ?userconfig? would be written back to openmw.cfg with the slugs replaced, which defeats the object of using the slugs.
This is also fixed.
Tracking which settings are user settings and which are in a non-editable openmw.cfg allows the launcher to grey out rows so they can't be edited (which is sensible as they can't be edited on-disk) while still being aware of content files that are provided by non-user data directories etc.
This is done in a pretty straightforward way for the data directories and fallback-archives, as those bits of UI are basic, but it's more complicated for content files as that uses a nmodel/view approach and has a lot more moving parts.
Thankfully, I'd already implemented that when dealing with builtin.omwscripts, so it just needed wiring up.
One more thing of note is that I made the SettingValue struct storable as a QVariant so it could be attached to the UI widgets as userdata, and then I could just grab the original representation and use it instead of needing any complicated mapping from display value to on-disk value.
10 months ago
|
|
|
QList<SettingValue> dirs(gameSettings.getDataDirs());
|
|
|
|
dirs.erase(std::remove_if(
|
|
|
|
dirs.begin(), dirs.end(), [&](const SettingValue& dir) { return !gameSettings.isUserSetting(dir); }),
|
|
|
|
dirs.end());
|
|
|
|
// archives and content files aren't preprocessed, so we don't need to track their original form
|
|
|
|
const QList<SettingValue> archivesOriginal(gameSettings.getArchiveList());
|
|
|
|
QStringList archives;
|
|
|
|
for (const auto& archive : archivesOriginal)
|
|
|
|
{
|
|
|
|
if (gameSettings.isUserSetting(archive))
|
|
|
|
archives.push_back(archive.value);
|
|
|
|
}
|
|
|
|
const QList<SettingValue> filesOriginal(gameSettings.getContentList());
|
|
|
|
QStringList files;
|
|
|
|
for (const auto& file : filesOriginal)
|
|
|
|
{
|
|
|
|
if (gameSettings.isUserSetting(file))
|
|
|
|
files.push_back(file.value);
|
|
|
|
}
|
|
|
|
|
|
|
|
// if openmw.cfg has no content, exit so we don't create an empty content list.
|
|
|
|
if (dirs.isEmpty() || files.isEmpty())
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// local data directory and resources/vfs are not part of any profile
|
|
|
|
const auto resourcesVfs = gameSettings.getResourcesVfs();
|
|
|
|
const auto dataLocal = gameSettings.getDataLocal();
|
Track source of settings
This one's a biggie.
The basic idea's that GameSettings should know:
* what the interpreted value of a setting is, so it can actually be used.
* what the original value the user put in their config was, so it can be put back when the config's saved.
* which path it's processing the openmw.cfg from so relative paths can be resolved correctly.
* whether a setting's a user setting that can be modified, or from one of the other openmw.cfg files that can't necessarily be modified.
This had fairly wide-reaching implications.
The first is that paths are resolved properly in cases where they previously wouldn't have been.
Without this commit, if the launcher saw a relative path in an openmw.cfg, it'd be resolved relative to the process' working directory (which we always set to the binary directory for reasons I won't get into).
That's not what the engine does, so is bad.
It's also not something a user's likely to suspect.
This mess is no longer a problem as paths are resolved correctly when they're loaded instead of on demand when they're used by whatever uses them.
Another problem was that if paths used slugs like ?userconfig? would be written back to openmw.cfg with the slugs replaced, which defeats the object of using the slugs.
This is also fixed.
Tracking which settings are user settings and which are in a non-editable openmw.cfg allows the launcher to grey out rows so they can't be edited (which is sensible as they can't be edited on-disk) while still being aware of content files that are provided by non-user data directories etc.
This is done in a pretty straightforward way for the data directories and fallback-archives, as those bits of UI are basic, but it's more complicated for content files as that uses a nmodel/view approach and has a lot more moving parts.
Thankfully, I'd already implemented that when dealing with builtin.omwscripts, so it just needed wiring up.
One more thing of note is that I made the SettingValue struct storable as a QVariant so it could be attached to the UI widgets as userdata, and then I could just grab the original representation and use it instead of needing any complicated mapping from display value to on-disk value.
10 months ago
|
|
|
dirs.erase(
|
|
|
|
std::remove_if(dirs.begin(), dirs.end(), [&](const SettingValue& dir) { return dir.value == resourcesVfs; }),
|
|
|
|
dirs.end());
|
|
|
|
dirs.erase(
|
|
|
|
std::remove_if(dirs.begin(), dirs.end(), [&](const SettingValue& dir) { return dir.value == dataLocal; }),
|
|
|
|
dirs.end());
|
|
|
|
|
|
|
|
// if any existing profile in launcher matches the content list, make that profile the default
|
|
|
|
for (const QString& listName : getContentLists())
|
|
|
|
{
|
Track source of settings
This one's a biggie.
The basic idea's that GameSettings should know:
* what the interpreted value of a setting is, so it can actually be used.
* what the original value the user put in their config was, so it can be put back when the config's saved.
* which path it's processing the openmw.cfg from so relative paths can be resolved correctly.
* whether a setting's a user setting that can be modified, or from one of the other openmw.cfg files that can't necessarily be modified.
This had fairly wide-reaching implications.
The first is that paths are resolved properly in cases where they previously wouldn't have been.
Without this commit, if the launcher saw a relative path in an openmw.cfg, it'd be resolved relative to the process' working directory (which we always set to the binary directory for reasons I won't get into).
That's not what the engine does, so is bad.
It's also not something a user's likely to suspect.
This mess is no longer a problem as paths are resolved correctly when they're loaded instead of on demand when they're used by whatever uses them.
Another problem was that if paths used slugs like ?userconfig? would be written back to openmw.cfg with the slugs replaced, which defeats the object of using the slugs.
This is also fixed.
Tracking which settings are user settings and which are in a non-editable openmw.cfg allows the launcher to grey out rows so they can't be edited (which is sensible as they can't be edited on-disk) while still being aware of content files that are provided by non-user data directories etc.
This is done in a pretty straightforward way for the data directories and fallback-archives, as those bits of UI are basic, but it's more complicated for content files as that uses a nmodel/view approach and has a lot more moving parts.
Thankfully, I'd already implemented that when dealing with builtin.omwscripts, so it just needed wiring up.
One more thing of note is that I made the SettingValue struct storable as a QVariant so it could be attached to the UI widgets as userdata, and then I could just grab the original representation and use it instead of needing any complicated mapping from display value to on-disk value.
10 months ago
|
|
|
const auto& listDirs = getDataDirectoryList(listName);
|
|
|
|
constexpr auto compareDataDirectories = [](const SettingValue& dir, const QString& listDir) {
|
Store original representation of paths in content lists
Also compare against existing content lists in a more forgiving way.
The first improvement makes it possible to use relative paths in openmw.cfg without the launcher canonicalising them.
This was really annoying if you used a relative path on purpose.
It also stops the launcher converting all paths to Qt's convention, where forward slashes are used on Windows even though they're not native.
The engine doesn't care, so you could always put either in the config file, but the launcher wouldn't stand for that, and would make them match.
To make this work, we need to store a path's originalRepresentation in the content list, compare paths loaded from openmw.cfg based on their originalRepresentation, and convert paths from originalRepresentation to absolute value when loading them from a content list.
The second improvement means that paths that are equivalent, but expressed differently (e.g. mismatched case on Windows, mismatched separators on Windows, or mild differences like unnecessary `./`es and doubled separators) don't trigger the creation of a new effectively-identical content list.
To make this work, we had to switch the comparison to lexicaly normalise the path first.
It could only be lexical normalisation as originalRepresentation might be absolute, relative, or absolute-but-based-on-a-path-slug, and we didn't want slugs to break things or relative paths to count as equivalent to absolute ones that refer to the same file.
The comparison is case-insensitive on Windows, and case-sensitive elsewhere.
This isn't strictly right, as you can have case-sensitive things mounted on Windows or tell a Linux directory to be case-insensitive, but we can't tell when that might happen based on a lexical path as it depends on real directory properties (and might differ for different parts of the path, which is too much hassle to support).
2 months ago
|
|
|
#ifdef Q_OS_WINDOWS
|
|
|
|
constexpr auto caseSensitivity = Qt::CaseInsensitive;
|
Store original representation of paths in content lists
Also compare against existing content lists in a more forgiving way.
The first improvement makes it possible to use relative paths in openmw.cfg without the launcher canonicalising them.
This was really annoying if you used a relative path on purpose.
It also stops the launcher converting all paths to Qt's convention, where forward slashes are used on Windows even though they're not native.
The engine doesn't care, so you could always put either in the config file, but the launcher wouldn't stand for that, and would make them match.
To make this work, we need to store a path's originalRepresentation in the content list, compare paths loaded from openmw.cfg based on their originalRepresentation, and convert paths from originalRepresentation to absolute value when loading them from a content list.
The second improvement means that paths that are equivalent, but expressed differently (e.g. mismatched case on Windows, mismatched separators on Windows, or mild differences like unnecessary `./`es and doubled separators) don't trigger the creation of a new effectively-identical content list.
To make this work, we had to switch the comparison to lexicaly normalise the path first.
It could only be lexical normalisation as originalRepresentation might be absolute, relative, or absolute-but-based-on-a-path-slug, and we didn't want slugs to break things or relative paths to count as equivalent to absolute ones that refer to the same file.
The comparison is case-insensitive on Windows, and case-sensitive elsewhere.
This isn't strictly right, as you can have case-sensitive things mounted on Windows or tell a Linux directory to be case-insensitive, but we can't tell when that might happen based on a lexical path as it depends on real directory properties (and might differ for different parts of the path, which is too much hassle to support).
2 months ago
|
|
|
#else
|
|
|
|
constexpr auto caseSensitivity = Qt::CaseSensitive;
|
Store original representation of paths in content lists
Also compare against existing content lists in a more forgiving way.
The first improvement makes it possible to use relative paths in openmw.cfg without the launcher canonicalising them.
This was really annoying if you used a relative path on purpose.
It also stops the launcher converting all paths to Qt's convention, where forward slashes are used on Windows even though they're not native.
The engine doesn't care, so you could always put either in the config file, but the launcher wouldn't stand for that, and would make them match.
To make this work, we need to store a path's originalRepresentation in the content list, compare paths loaded from openmw.cfg based on their originalRepresentation, and convert paths from originalRepresentation to absolute value when loading them from a content list.
The second improvement means that paths that are equivalent, but expressed differently (e.g. mismatched case on Windows, mismatched separators on Windows, or mild differences like unnecessary `./`es and doubled separators) don't trigger the creation of a new effectively-identical content list.
To make this work, we had to switch the comparison to lexicaly normalise the path first.
It could only be lexical normalisation as originalRepresentation might be absolute, relative, or absolute-but-based-on-a-path-slug, and we didn't want slugs to break things or relative paths to count as equivalent to absolute ones that refer to the same file.
The comparison is case-insensitive on Windows, and case-sensitive elsewhere.
This isn't strictly right, as you can have case-sensitive things mounted on Windows or tell a Linux directory to be case-insensitive, but we can't tell when that might happen based on a lexical path as it depends on real directory properties (and might differ for different parts of the path, which is too much hassle to support).
2 months ago
|
|
|
#endif
|
|
|
|
return dir.originalRepresentation == listDir
|
|
|
|
|| QDir::cleanPath(dir.originalRepresentation).compare(QDir::cleanPath(listDir), caseSensitivity) == 0;
|
Store original representation of paths in content lists
Also compare against existing content lists in a more forgiving way.
The first improvement makes it possible to use relative paths in openmw.cfg without the launcher canonicalising them.
This was really annoying if you used a relative path on purpose.
It also stops the launcher converting all paths to Qt's convention, where forward slashes are used on Windows even though they're not native.
The engine doesn't care, so you could always put either in the config file, but the launcher wouldn't stand for that, and would make them match.
To make this work, we need to store a path's originalRepresentation in the content list, compare paths loaded from openmw.cfg based on their originalRepresentation, and convert paths from originalRepresentation to absolute value when loading them from a content list.
The second improvement means that paths that are equivalent, but expressed differently (e.g. mismatched case on Windows, mismatched separators on Windows, or mild differences like unnecessary `./`es and doubled separators) don't trigger the creation of a new effectively-identical content list.
To make this work, we had to switch the comparison to lexicaly normalise the path first.
It could only be lexical normalisation as originalRepresentation might be absolute, relative, or absolute-but-based-on-a-path-slug, and we didn't want slugs to break things or relative paths to count as equivalent to absolute ones that refer to the same file.
The comparison is case-insensitive on Windows, and case-sensitive elsewhere.
This isn't strictly right, as you can have case-sensitive things mounted on Windows or tell a Linux directory to be case-insensitive, but we can't tell when that might happen based on a lexical path as it depends on real directory properties (and might differ for different parts of the path, which is too much hassle to support).
2 months ago
|
|
|
};
|
|
|
|
if (!std::ranges::equal(dirs, listDirs, compareDataDirectories))
|
Track source of settings
This one's a biggie.
The basic idea's that GameSettings should know:
* what the interpreted value of a setting is, so it can actually be used.
* what the original value the user put in their config was, so it can be put back when the config's saved.
* which path it's processing the openmw.cfg from so relative paths can be resolved correctly.
* whether a setting's a user setting that can be modified, or from one of the other openmw.cfg files that can't necessarily be modified.
This had fairly wide-reaching implications.
The first is that paths are resolved properly in cases where they previously wouldn't have been.
Without this commit, if the launcher saw a relative path in an openmw.cfg, it'd be resolved relative to the process' working directory (which we always set to the binary directory for reasons I won't get into).
That's not what the engine does, so is bad.
It's also not something a user's likely to suspect.
This mess is no longer a problem as paths are resolved correctly when they're loaded instead of on demand when they're used by whatever uses them.
Another problem was that if paths used slugs like ?userconfig? would be written back to openmw.cfg with the slugs replaced, which defeats the object of using the slugs.
This is also fixed.
Tracking which settings are user settings and which are in a non-editable openmw.cfg allows the launcher to grey out rows so they can't be edited (which is sensible as they can't be edited on-disk) while still being aware of content files that are provided by non-user data directories etc.
This is done in a pretty straightforward way for the data directories and fallback-archives, as those bits of UI are basic, but it's more complicated for content files as that uses a nmodel/view approach and has a lot more moving parts.
Thankfully, I'd already implemented that when dealing with builtin.omwscripts, so it just needed wiring up.
One more thing of note is that I made the SettingValue struct storable as a QVariant so it could be attached to the UI widgets as userdata, and then I could just grab the original representation and use it instead of needing any complicated mapping from display value to on-disk value.
10 months ago
|
|
|
continue;
|
|
|
|
constexpr auto compareFiles
|
|
|
|
= [](const QString& a, const QString& b) { return a.compare(b, Qt::CaseInsensitive) == 0; };
|
|
|
|
if (!std::ranges::equal(files, getContentListFiles(listName), compareFiles))
|
|
|
|
continue;
|
|
|
|
if (!std::ranges::equal(archives, getArchiveList(listName), compareFiles))
|
|
|
|
continue;
|
|
|
|
setCurrentContentListName(listName);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// otherwise, add content list
|
|
|
|
QString newContentListName(makeNewContentListName());
|
|
|
|
setCurrentContentListName(newContentListName);
|
Track source of settings
This one's a biggie.
The basic idea's that GameSettings should know:
* what the interpreted value of a setting is, so it can actually be used.
* what the original value the user put in their config was, so it can be put back when the config's saved.
* which path it's processing the openmw.cfg from so relative paths can be resolved correctly.
* whether a setting's a user setting that can be modified, or from one of the other openmw.cfg files that can't necessarily be modified.
This had fairly wide-reaching implications.
The first is that paths are resolved properly in cases where they previously wouldn't have been.
Without this commit, if the launcher saw a relative path in an openmw.cfg, it'd be resolved relative to the process' working directory (which we always set to the binary directory for reasons I won't get into).
That's not what the engine does, so is bad.
It's also not something a user's likely to suspect.
This mess is no longer a problem as paths are resolved correctly when they're loaded instead of on demand when they're used by whatever uses them.
Another problem was that if paths used slugs like ?userconfig? would be written back to openmw.cfg with the slugs replaced, which defeats the object of using the slugs.
This is also fixed.
Tracking which settings are user settings and which are in a non-editable openmw.cfg allows the launcher to grey out rows so they can't be edited (which is sensible as they can't be edited on-disk) while still being aware of content files that are provided by non-user data directories etc.
This is done in a pretty straightforward way for the data directories and fallback-archives, as those bits of UI are basic, but it's more complicated for content files as that uses a nmodel/view approach and has a lot more moving parts.
Thankfully, I'd already implemented that when dealing with builtin.omwscripts, so it just needed wiring up.
One more thing of note is that I made the SettingValue struct storable as a QVariant so it could be attached to the UI widgets as userdata, and then I could just grab the original representation and use it instead of needing any complicated mapping from display value to on-disk value.
10 months ago
|
|
|
QStringList newListDirs;
|
|
|
|
for (const auto& dir : dirs)
|
Store original representation of paths in content lists
Also compare against existing content lists in a more forgiving way.
The first improvement makes it possible to use relative paths in openmw.cfg without the launcher canonicalising them.
This was really annoying if you used a relative path on purpose.
It also stops the launcher converting all paths to Qt's convention, where forward slashes are used on Windows even though they're not native.
The engine doesn't care, so you could always put either in the config file, but the launcher wouldn't stand for that, and would make them match.
To make this work, we need to store a path's originalRepresentation in the content list, compare paths loaded from openmw.cfg based on their originalRepresentation, and convert paths from originalRepresentation to absolute value when loading them from a content list.
The second improvement means that paths that are equivalent, but expressed differently (e.g. mismatched case on Windows, mismatched separators on Windows, or mild differences like unnecessary `./`es and doubled separators) don't trigger the creation of a new effectively-identical content list.
To make this work, we had to switch the comparison to lexicaly normalise the path first.
It could only be lexical normalisation as originalRepresentation might be absolute, relative, or absolute-but-based-on-a-path-slug, and we didn't want slugs to break things or relative paths to count as equivalent to absolute ones that refer to the same file.
The comparison is case-insensitive on Windows, and case-sensitive elsewhere.
This isn't strictly right, as you can have case-sensitive things mounted on Windows or tell a Linux directory to be case-insensitive, but we can't tell when that might happen based on a lexical path as it depends on real directory properties (and might differ for different parts of the path, which is too much hassle to support).
2 months ago
|
|
|
newListDirs.push_back(dir.originalRepresentation);
|
Track source of settings
This one's a biggie.
The basic idea's that GameSettings should know:
* what the interpreted value of a setting is, so it can actually be used.
* what the original value the user put in their config was, so it can be put back when the config's saved.
* which path it's processing the openmw.cfg from so relative paths can be resolved correctly.
* whether a setting's a user setting that can be modified, or from one of the other openmw.cfg files that can't necessarily be modified.
This had fairly wide-reaching implications.
The first is that paths are resolved properly in cases where they previously wouldn't have been.
Without this commit, if the launcher saw a relative path in an openmw.cfg, it'd be resolved relative to the process' working directory (which we always set to the binary directory for reasons I won't get into).
That's not what the engine does, so is bad.
It's also not something a user's likely to suspect.
This mess is no longer a problem as paths are resolved correctly when they're loaded instead of on demand when they're used by whatever uses them.
Another problem was that if paths used slugs like ?userconfig? would be written back to openmw.cfg with the slugs replaced, which defeats the object of using the slugs.
This is also fixed.
Tracking which settings are user settings and which are in a non-editable openmw.cfg allows the launcher to grey out rows so they can't be edited (which is sensible as they can't be edited on-disk) while still being aware of content files that are provided by non-user data directories etc.
This is done in a pretty straightforward way for the data directories and fallback-archives, as those bits of UI are basic, but it's more complicated for content files as that uses a nmodel/view approach and has a lot more moving parts.
Thankfully, I'd already implemented that when dealing with builtin.omwscripts, so it just needed wiring up.
One more thing of note is that I made the SettingValue struct storable as a QVariant so it could be attached to the UI widgets as userdata, and then I could just grab the original representation and use it instead of needing any complicated mapping from display value to on-disk value.
10 months ago
|
|
|
setContentList(newContentListName, newListDirs, archives, files);
|
|
|
|
}
|
|
|
|
|
|
|
|
void Config::LauncherSettings::setContentList(const QString& contentListName, const QStringList& dirNames,
|
|
|
|
const QStringList& archiveNames, const QStringList& fileNames)
|
|
|
|
{
|
|
|
|
Profile& profile = mProfiles.mValues[contentListName];
|
|
|
|
profile.mData = dirNames;
|
|
|
|
profile.mArchives = archiveNames;
|
|
|
|
profile.mContent = fileNames;
|
|
|
|
}
|
|
|
|
|
|
|
|
QStringList Config::LauncherSettings::getDataDirectoryList(const QString& contentListName) const
|
|
|
|
{
|
|
|
|
const Profile* profile = findProfile(contentListName);
|
|
|
|
if (profile == nullptr)
|
|
|
|
return {};
|
|
|
|
return profile->mData;
|
|
|
|
}
|
|
|
|
|
|
|
|
QStringList Config::LauncherSettings::getArchiveList(const QString& contentListName) const
|
|
|
|
{
|
|
|
|
const Profile* profile = findProfile(contentListName);
|
|
|
|
if (profile == nullptr)
|
|
|
|
return {};
|
|
|
|
return profile->mArchives;
|
|
|
|
}
|
|
|
|
|
|
|
|
QStringList Config::LauncherSettings::getContentListFiles(const QString& contentListName) const
|
|
|
|
{
|
|
|
|
const Profile* profile = findProfile(contentListName);
|
|
|
|
if (profile == nullptr)
|
|
|
|
return {};
|
|
|
|
return profile->mContent;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool Config::LauncherSettings::setValue(const QString& sectionPrefix, const QString& key, const QString& value)
|
|
|
|
{
|
|
|
|
if (sectionPrefix == sSettingsSection)
|
|
|
|
return parseSettingsSection(key, value, mSettings);
|
|
|
|
if (sectionPrefix == sProfilesSection)
|
|
|
|
return parseProfilesSection(key, value, mProfiles);
|
|
|
|
if (sectionPrefix == sGeneralSection)
|
|
|
|
return parseGeneralSection(key, value, mGeneral);
|
|
|
|
if (sectionPrefix == sImporterSection)
|
|
|
|
return parseImporterSection(key, value, mImporter);
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
void Config::LauncherSettings::readFile(QTextStream& stream)
|
|
|
|
{
|
|
|
|
const QRegularExpression sectionRe("^\\[([^]]+)\\]$");
|
|
|
|
const QRegularExpression keyRe("^([^=]+)\\s*=\\s*(.+)$");
|
|
|
|
|
|
|
|
QString section;
|
|
|
|
|
|
|
|
while (!stream.atEnd())
|
|
|
|
{
|
|
|
|
const QString line = stream.readLine();
|
|
|
|
|
|
|
|
if (line.isEmpty() || line.startsWith("#"))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
const QRegularExpressionMatch sectionMatch = sectionRe.match(line);
|
|
|
|
if (sectionMatch.hasMatch())
|
|
|
|
{
|
|
|
|
section = sectionMatch.captured(1);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (section.isEmpty())
|
|
|
|
continue;
|
|
|
|
|
|
|
|
const QRegularExpressionMatch keyMatch = keyRe.match(line);
|
|
|
|
if (!keyMatch.hasMatch())
|
|
|
|
continue;
|
|
|
|
|
|
|
|
const QString key = keyMatch.captured(1).trimmed();
|
|
|
|
const QString value = keyMatch.captured(2).trimmed();
|
|
|
|
|
|
|
|
if (!setValue(section, key, value))
|
|
|
|
Log(Debug::Warning) << "Unsupported setting in the launcher config file: section: "
|
|
|
|
<< section.toUtf8().constData() << " key: " << key.toUtf8().constData()
|
|
|
|
<< " value: " << value.toUtf8().constData();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
const Config::LauncherSettings::Profile* Config::LauncherSettings::findProfile(const QString& name) const
|
|
|
|
{
|
|
|
|
const auto it = mProfiles.mValues.find(name);
|
|
|
|
if (it == mProfiles.mValues.end())
|
|
|
|
return nullptr;
|
|
|
|
return &it->second;
|
|
|
|
}
|
|
|
|
|
|
|
|
void Config::LauncherSettings::clear()
|
|
|
|
{
|
|
|
|
mSettings = Settings{};
|
|
|
|
mGeneral = General{};
|
|
|
|
mProfiles = Profiles{};
|
|
|
|
mImporter = Importer{};
|
|
|
|
}
|