summaryrefslogtreecommitdiff
path: root/src/profile.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/profile.cpp')
-rw-r--r--src/profile.cpp124
1 files changed, 69 insertions, 55 deletions
diff --git a/src/profile.cpp b/src/profile.cpp
index ef387027..f041a241 100644
--- a/src/profile.cpp
+++ b/src/profile.cpp
@@ -40,7 +40,6 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#include <QMessageBox>
#include <QScopedArrayPointer>
#include <QStringList> // for QStringList
-#include <QtDebug> // for qDebug, qWarning, etc
#include <QtGlobal> // for qUtf8Printable
#include <QBuffer>
#include <QDirIterator>
@@ -74,7 +73,7 @@ Profile::Profile(const QString &name, IPluginGame const *gamePlugin, bool useDef
: m_ModListWriter(std::bind(&Profile::doWriteModlist, this))
, m_GamePlugin(gamePlugin)
{
- QString profilesDir = Settings::instance().getProfileDirectory();
+ QString profilesDir = Settings::instance().paths().profiles();
QDir profileBase(profilesDir);
QString fixedName = name;
if (!fixDirectoryName(fixedName)) {
@@ -125,7 +124,7 @@ Profile::Profile(const QDir &directory, IPluginGame const *gamePlugin)
findProfileSettings();
if (!QFile::exists(m_Directory.filePath("modlist.txt"))) {
- qWarning("missing modlist.txt in %s", qUtf8Printable(directory.path()));
+ log::warn("missing modlist.txt in {}", directory.path());
touchFile(m_Directory.filePath("modlist.txt"));
}
@@ -158,42 +157,42 @@ Profile::~Profile()
void Profile::findProfileSettings()
{
- if (setting("LocalSaves") == QVariant()) {
+ if (setting("", "LocalSaves") == QVariant()) {
if (m_Directory.exists("saves")) {
- storeSetting("LocalSaves", true);
+ storeSetting("", "LocalSaves", true);
} else {
if (m_Directory.exists("_saves")) {
m_Directory.rename("_saves", "saves");
}
- storeSetting("LocalSaves", false);
+ storeSetting("", "LocalSaves", false);
}
}
- if (setting("LocalSettings") == QVariant()) {
+ if (setting("", "LocalSettings") == QVariant()) {
QString backupFile = getIniFileName() + "_";
if (m_Directory.exists(backupFile)) {
- storeSetting("LocalSettings", false);
+ storeSetting("", "LocalSettings", false);
m_Directory.rename(backupFile, getIniFileName());
} else {
- storeSetting("LocalSettings", true);
+ storeSetting("", "LocalSettings", true);
}
}
- if (setting("AutomaticArchiveInvalidation") == QVariant()) {
+ if (setting("", "AutomaticArchiveInvalidation") == QVariant()) {
BSAInvalidation *invalidation = m_GamePlugin->feature<BSAInvalidation>();
DataArchives *dataArchives = m_GamePlugin->feature<DataArchives>();
bool found = false;
if ((invalidation != nullptr) && (dataArchives != nullptr)) {
for (const QString &archive : dataArchives->archives(this)) {
if (invalidation->isInvalidationBSA(archive)) {
- storeSetting("AutomaticArchiveInvalidation", true);
+ storeSetting("", "AutomaticArchiveInvalidation", true);
found = true;
break;
}
}
}
if (!found) {
- storeSetting("AutomaticArchiveInvalidation", false);
+ storeSetting("", "AutomaticArchiveInvalidation", false);
}
}
}
@@ -232,7 +231,6 @@ void Profile::doWriteModlist()
}
for (std::map<int, unsigned int>::const_reverse_iterator iter = m_ModIndexByPriority.crbegin(); iter != m_ModIndexByPriority.crend(); iter++ ) {
- //qDebug(QString("write mod %1 to priority %2").arg(iter->first).arg(iter->second).toLocal8Bit());
// the priority order was inverted on load so it has to be inverted again
unsigned int index = iter->second;
if (index != UINT_MAX) {
@@ -253,7 +251,7 @@ void Profile::doWriteModlist()
}
if (file.commitIfDifferent(m_LastModlistHash)) {
- qDebug("%s saved", qUtf8Printable(QDir::toNativeSeparators(fileName)));
+ log::debug("{} saved", QDir::toNativeSeparators(fileName));
}
} catch (const std::exception &e) {
reportError(tr("failed to write mod list: %1").arg(e.what()));
@@ -267,7 +265,10 @@ void Profile::createTweakedIniFile()
QString tweakedIni = m_Directory.absoluteFilePath("initweaks.ini");
if (QFile::exists(tweakedIni) && !shellDeleteQuiet(tweakedIni)) {
- reportError(tr("failed to update tweaked ini file, wrong settings may be used: %1").arg(windowsErrorString(::GetLastError())));
+ const auto e = GetLastError();
+ reportError(
+ tr("failed to update tweaked ini file, wrong settings may be used: %1")
+ .arg(QString::fromStdWString(formatSystemMessage(e))));
return;
}
@@ -287,15 +288,18 @@ void Profile::createTweakedIniFile()
}
if (error) {
- reportError(tr("failed to create tweaked ini: %1").arg(getCurrentErrorString().c_str()));
+ const auto e = ::GetLastError();
+ reportError(tr("failed to create tweaked ini: %1")
+ .arg(QString::fromStdWString(formatSystemMessage(e))));
}
- qDebug("%s saved", qUtf8Printable(QDir::toNativeSeparators(tweakedIni)));
+
+ log::debug("{} saved", QDir::toNativeSeparators(tweakedIni));
}
// static
void Profile::renameModInAllProfiles(const QString& oldName, const QString& newName)
{
- QDir profilesDir(Settings::instance().getProfileDirectory());
+ QDir profilesDir(Settings::instance().paths().profiles());
profilesDir.setFilter(QDir::AllDirs | QDir::NoDotAndDotDot);
QDirIterator profileIter(profilesDir);
while (profileIter.hasNext()) {
@@ -304,7 +308,7 @@ void Profile::renameModInAllProfiles(const QString& oldName, const QString& newN
if (modList.exists())
renameModInList(modList, oldName, newName);
else
- qWarning("Profile has no modlist.txt : %s", qUtf8Printable(profileIter.filePath()));
+ log::warn("Profile has no modlist.txt: {}", profileIter.filePath());
}
}
@@ -325,7 +329,7 @@ void Profile::renameModInList(QFile &modList, const QString &oldName, const QStr
if (line.length() == 0) {
// ignore empty lines
- qWarning("mod list contained invalid data: empty line");
+ log::warn("mod list contained invalid data: empty line");
continue;
}
@@ -340,7 +344,7 @@ void Profile::renameModInList(QFile &modList, const QString &oldName, const QStr
if (modName.isEmpty()) {
// file broken?
- qWarning("mod list contained invalid data: missing mod name");
+ log::warn("mod list contained invalid data: missing mod name");
continue;
}
@@ -361,8 +365,9 @@ void Profile::renameModInList(QFile &modList, const QString &oldName, const QStr
}
if (renamed)
- qDebug("Renamed %d \"%s\" mod to \"%s\" in %s",
- renamed, qUtf8Printable(oldName), qUtf8Printable(newName), qUtf8Printable(modList.fileName()));
+ log::debug(
+ "Renamed {} \"{}\" mod to \"{}\" in {}",
+ renamed, oldName, newName, modList.fileName());
}
void Profile::refreshModStatus()
@@ -421,14 +426,16 @@ void Profile::refreshModStatus()
m_ModStatus[modIndex].m_Priority = index++;
}
} else {
- qWarning("no mod state for \"%s\" (profile \"%s\")",
- qUtf8Printable(modName), qUtf8Printable(m_Directory.path()));
+ log::warn(
+ "no mod state for \"{}\" (profile \"{}\")",
+ modName, m_Directory.path());
// need to rewrite the modlist to fix this
modStatusModified = true;
}
} else {
- qDebug("mod not found: \"%s\" (profile \"%s\")",
- qUtf8Printable(modName), qUtf8Printable(m_Directory.path()));
+ log::debug(
+ "mod not found: \"{}\" (profile \"{}\")",
+ modName, m_Directory.path());
// need to rewrite the modlist to fix this
modStatusModified = true;
}
@@ -492,8 +499,10 @@ void Profile::dumpModStatus() const
{
for (unsigned int i = 0; i < m_ModStatus.size(); ++i) {
ModInfo::Ptr info = ModInfo::getByIndex(i);
- qWarning("%d: %s - %d (%s)", i, info->name().toUtf8().constData(), m_ModStatus[i].m_Priority,
- m_ModStatus[i].m_Enabled ? "enabled" : "disabled");
+ log::warn(
+ "{}: {} - {} ({})",
+ i, info->name(), m_ModStatus[i].m_Priority,
+ m_ModStatus[i].m_Enabled ? "enabled" : "disabled");
}
}
@@ -566,7 +575,7 @@ void Profile::setModsEnabled(const QList<unsigned int> &modsToEnable, const QLis
QList<unsigned int> dirtyMods;
for (auto idx : modsToEnable) {
if (idx >= m_ModStatus.size()) {
- qCritical() << tr("invalid mod index: %1").arg(idx);
+ log::error("invalid mod index: {}", idx);
continue;
}
if (!m_ModStatus[idx].m_Enabled) {
@@ -576,7 +585,7 @@ void Profile::setModsEnabled(const QList<unsigned int> &modsToEnable, const QLis
}
for (auto idx : modsToDisable) {
if (idx >= m_ModStatus.size()) {
- qCritical() << tr("invalid mod index: %1").arg(idx);
+ log::error("invalid mod index: {}", idx);
continue;
}
if (ModInfo::getByIndex(idx)->alwaysEnabled()) {
@@ -646,7 +655,7 @@ void Profile::setModPriority(unsigned int index, int &newPriority)
Profile *Profile::createPtrFrom(const QString &name, const Profile &reference, MOBase::IPluginGame const *gamePlugin)
{
- QString profileDirectory = Settings::instance().getProfileDirectory() + "/" + name;
+ QString profileDirectory = Settings::instance().paths().profiles() + "/" + name;
reference.copyFilesTo(profileDirectory);
return new Profile(QDir(profileDirectory), gamePlugin);
}
@@ -733,7 +742,7 @@ bool Profile::invalidationActive(bool *supported) const
*supported = ((invalidation != nullptr) && (dataArchives != nullptr));
}
- return setting("AutomaticArchiveInvalidation", false).toBool();
+ return setting("", "AutomaticArchiveInvalidation", false).toBool();
}
@@ -745,7 +754,7 @@ void Profile::deactivateInvalidation()
invalidation->deactivate(this);
}
- storeSetting("AutomaticArchiveInvalidation", false);
+ storeSetting("", "AutomaticArchiveInvalidation", false);
}
@@ -757,13 +766,13 @@ void Profile::activateInvalidation()
invalidation->activate(this);
}
- storeSetting("AutomaticArchiveInvalidation", true);
+ storeSetting("", "AutomaticArchiveInvalidation", true);
}
bool Profile::localSavesEnabled() const
{
- return setting("LocalSaves", false).toBool();
+ return setting("", "LocalSaves", false).toBool();
}
@@ -788,19 +797,19 @@ bool Profile::enableLocalSaves(bool enable)
return false;
}
}
- storeSetting("LocalSaves", enable);
+ storeSetting("", "LocalSaves", enable);
return true;
}
bool Profile::localSettingsEnabled() const
{
- bool enabled = setting("LocalSettings", false).toBool();
+ bool enabled = setting("", "LocalSettings", false).toBool();
if (enabled) {
QStringList missingFiles;
for (QString file : m_GamePlugin->iniFiles()) {
if (!QFile::exists(m_Directory.filePath(file))) {
- qWarning("missing %s in %s", qUtf8Printable(file), qUtf8Printable(m_Directory.path()));
+ log::warn("missing {} in {}", file, m_Directory.path());
missingFiles << file;
}
}
@@ -840,7 +849,7 @@ bool Profile::enableLocalSettings(bool enable)
return false;
}
}
- storeSetting("LocalSettings", enable);
+ storeSetting("", "LocalSettings", enable);
return true;
}
@@ -897,36 +906,41 @@ QString Profile::savePath() const
void Profile::rename(const QString &newName)
{
- QDir profileDir(Settings::instance().getProfileDirectory());
+ QDir profileDir(Settings::instance().paths().profiles());
profileDir.rename(name(), newName);
- m_Directory = profileDir.absoluteFilePath(newName);
+ m_Directory.setPath(profileDir.absoluteFilePath(newName));
+}
+
+QString keyName(const QString &section, const QString &name)
+{
+ QString key = section;
+
+ if (!name.isEmpty()) {
+ if (!key.isEmpty()) {
+ key += "/";
+ }
+
+ key += name;
+ }
+
+ return key;
}
QVariant Profile::setting(const QString &section, const QString &name,
const QVariant &fallback) const
{
- return m_Settings->value(section + "/" + name, fallback);
+ return m_Settings->value(keyName(section, name), fallback);
}
void Profile::storeSetting(const QString &section, const QString &name,
const QVariant &value)
{
- m_Settings->setValue(section + "/" + name, value);
-}
-
-void Profile::storeSetting(const QString &name, const QVariant &value)
-{
- storeSetting("", name, value);
+ m_Settings->setValue(keyName(section, name), value);
}
void Profile::removeSetting(const QString &section, const QString &name)
{
- m_Settings->remove(section + "/" + name);
-}
-
-void Profile::removeSetting(const QString &name)
-{
- removeSetting("", name);
+ m_Settings->remove(keyName(section, name));
}
QVariantMap Profile::settingsByGroup(const QString &section) const
generated by cgit v1.3.1 (git 2.54.0) at 2026-07-22 23:51:26 +0000