summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--appveyor.yml28
-rw-r--r--src/mainwindow.cpp16
-rw-r--r--src/modinfoforeign.h5
-rw-r--r--src/modinfooverwrite.h5
-rw-r--r--src/modinforegular.cpp68
-rw-r--r--src/modinforegular.h10
6 files changed, 113 insertions, 19 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 1e690457..654ec0e2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,32 +20,34 @@ environment:
VER_STUB_NORMAL: dev-appveyor-
VER_STUB_NIGHTLY: dev-nightly-
build_script:
-- cmd: >-
- REM Maintenance comments:
+- pwsh: >-
+ # Maintenance comments:
- REM APPVEYOR_BUILD_FOLDER= "c:\projects\modorganizer-slug"
+ # APPVEYOR_BUILD_FOLDER= "c:\projects\modorganizer-slug"
- REM -Need to update py3 version used to invoke unimake.py once in a while.
+ # -Need to update py3 version used to invoke unimake.py once in a while.
- REM -Need update MO_VERSION env variable after each release.
+ # -Need update MO_VERSION env variable after each release.
- REM -Always clones umbrella master
+ # -Always clones umbrella master
- REM -Will checkout all the branches matching the one that triggered the build on the main repo.
+ # -Will checkout all the branches matching the one that triggered the build on the main repo.
- REM End comments.
+ # End comments.
+ $ErrorActionPreference = 'Stop'
- git clone --depth=1 https://github.com/ModOrganizer2/modorganizer-umbrella.git c:\projects\modorganizer-umbrella 2> $null
-
-
- mkdir %APPVEYOR_BUILD_FOLDER%\modorganizer-build -type directory
+ git clone --depth=1 --no-single-branch https://github.com/ModOrganizer2/modorganizer-umbrella.git c:\projects\modorganizer-umbrella
+ New-Item -ItemType Directory -Path ${env:APPVEYOR_BUILD_FOLDER}\modorganizer-build
cd c:\projects\modorganizer-umbrella
+ git checkout $(git show-ref --verify --quiet refs/remotes/origin/${env:APPVEYOR_REPO_BRANCH} || echo '-b') ${env:APPVEYOR_REPO_BRANCH}
+
+ C:\Python38-x64\python.exe unimake.py -d ${env:APPVEYOR_BUILD_FOLDER}\modorganizer-build -s Appveyor_Build=True -s Feature_Branch=${env:APPVEYOR_REPO_BRANCH} -s override_build_version=${env:APPVEYOR_BUILD_VERSION}
- C:\Python38-x64\python.exe unimake.py -d %APPVEYOR_BUILD_FOLDER%\modorganizer-build -s Appveyor_Build=True -s Feature_Branch=%APPVEYOR_REPO_BRANCH% -s override_build_version=%APPVEYOR_BUILD_VERSION%
+ if($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode ) }
test: off
artifacts:
- path: '\modorganizer-build\install\bin'
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 15315da1..34805518 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1893,12 +1893,16 @@ QDir MainWindow::currentSavesDir() const
iniPath += "/" + iniFiles[0];
wchar_t path[MAX_PATH];
- ::GetPrivateProfileStringW(
- L"General", L"SLocalSavePath", L"Saves",
- path, MAX_PATH,
- iniPath.toStdWString().c_str()
- );
- savesDir.setPath(m_OrganizerCore.managedGame()->documentsDirectory().absoluteFilePath(QString::fromWCharArray(path)));
+ if (::GetPrivateProfileStringW(
+ L"General", L"SLocalSavePath", L"",
+ path, MAX_PATH,
+ iniPath.toStdWString().c_str()
+ )) {
+ savesDir.setPath(m_OrganizerCore.managedGame()->documentsDirectory().absoluteFilePath(QString::fromWCharArray(path)));
+ }
+ else {
+ savesDir = m_OrganizerCore.managedGame()->savesDirectory();
+ }
}
return savesDir;
diff --git a/src/modinfoforeign.h b/src/modinfoforeign.h
index d2ffc597..4f830799 100644
--- a/src/modinfoforeign.h
+++ b/src/modinfoforeign.h
@@ -70,6 +70,11 @@ public:
virtual void addInstalledFile(int, int) override {}
virtual std::set<std::pair<int, int>> installedFiles() const override { return {}; }
+ virtual QVariant pluginSetting(const QString& pluginName, const QString& key, const QVariant& defaultValue) const override { return defaultValue; }
+ virtual std::map<QString, QVariant> pluginSettings(const QString& pluginName) const override { return {}; }
+ virtual bool setPluginSetting(const QString& pluginName, const QString& key, const QVariant& value) override { return false; }
+ virtual std::map<QString, QVariant> clearPluginSettings(const QString& pluginName) override { return {}; }
+
ModInfo::EModType modType() const { return m_ModType; }
protected:
diff --git a/src/modinfooverwrite.h b/src/modinfooverwrite.h
index 0e00d7a1..502581ce 100644
--- a/src/modinfooverwrite.h
+++ b/src/modinfooverwrite.h
@@ -71,6 +71,11 @@ public:
virtual void addInstalledFile(int, int) override {}
virtual std::set<std::pair<int, int>> installedFiles() const override { return {}; }
+ virtual QVariant pluginSetting(const QString& pluginName, const QString& key, const QVariant& defaultValue) const override { return defaultValue; }
+ virtual std::map<QString, QVariant> pluginSettings(const QString& pluginName) const override { return {}; }
+ virtual bool setPluginSetting(const QString& pluginName, const QString& key, const QVariant& value) override { return false; }
+ virtual std::map<QString, QVariant> clearPluginSettings(const QString& pluginName) override { return {}; }
+
private:
ModInfoOverwrite(PluginContainer *pluginContainer, const MOBase::IPluginGame* game, MOShared::DirectoryEntry **directoryStructure);
diff --git a/src/modinforegular.cpp b/src/modinforegular.cpp
index b3eeba7d..78c04f2d 100644
--- a/src/modinforegular.cpp
+++ b/src/modinforegular.cpp
@@ -206,6 +206,17 @@ void ModInfoRegular::readMeta()
}
metaFile.endArray();
+ // Plugin settings:
+ metaFile.beginGroup("Plugins");
+ for (auto pluginName: metaFile.childGroups()) {
+ metaFile.beginGroup(pluginName);
+ for (auto settingKey : metaFile.childKeys()) {
+ m_PluginSettings[pluginName][settingKey] = metaFile.value(settingKey);
+ }
+ metaFile.endGroup();
+ }
+ metaFile.endGroup();
+
m_MetaInfoChanged = false;
}
@@ -252,6 +263,18 @@ void ModInfoRegular::saveMeta()
}
metaFile.endArray();
+ // Plugin settings:
+ metaFile.remove("Plugins");
+ metaFile.beginGroup("Plugins");
+ for (const auto& [pluginName, pluginSettings]: m_PluginSettings) {
+ metaFile.beginGroup(pluginName);
+ for (const auto& [settingName, settingValue]: pluginSettings) {
+ metaFile.setValue(settingName, settingValue);
+ }
+ metaFile.endGroup();
+ }
+ metaFile.endGroup();
+
metaFile.sync(); // sync needs to be called to ensure the file is created
if (metaFile.status() == QSettings::NoError) {
@@ -851,3 +874,48 @@ std::vector<QString> ModInfoRegular::getIniTweaks() const
metaFile.endArray();
return result;
}
+
+
+std::map<QString, QVariant> ModInfoRegular::pluginSettings(const QString& pluginName) const
+{
+ auto itp = m_PluginSettings.find(pluginName);
+ if (itp == std::end(m_PluginSettings)) {
+ return {};
+ }
+ return itp->second;
+}
+
+QVariant ModInfoRegular::pluginSetting(const QString& pluginName, const QString& key, const QVariant& defaultValue) const
+{
+ auto itp = m_PluginSettings.find(pluginName);
+ if (itp == std::end(m_PluginSettings)) {
+ return defaultValue;
+ }
+
+ auto its = itp->second.find(key);
+ if (its == std::end(itp->second)) {
+ return defaultValue;
+ }
+
+ return its->second;
+}
+
+bool ModInfoRegular::setPluginSetting(const QString& pluginName, const QString& key, const QVariant& value)
+{
+ m_PluginSettings[pluginName][key] = value;
+ m_MetaInfoChanged = true;
+ saveMeta();
+ return true;
+}
+
+std::map<QString, QVariant> ModInfoRegular::clearPluginSettings(const QString& pluginName)
+{
+ auto itp = m_PluginSettings.find(pluginName);
+ if (itp == std::end(m_PluginSettings)) {
+ return {};
+ }
+ auto settings = itp->second;
+ m_PluginSettings.erase(itp);
+ saveMeta();
+ return settings;
+}
diff --git a/src/modinforegular.h b/src/modinforegular.h
index 48c871bb..f2e0b82d 100644
--- a/src/modinforegular.h
+++ b/src/modinforegular.h
@@ -401,6 +401,13 @@ public:
virtual bool validated() const override { return m_Validated; }
virtual std::set<std::pair<int, int>> installedFiles() const override { return m_InstalledFileIDs; }
+public: // Plugin operations:
+
+ virtual QVariant pluginSetting(const QString& pluginName, const QString& key, const QVariant& defaultValue) const override;
+ virtual std::map<QString, QVariant> pluginSettings(const QString& pluginName) const override;
+ virtual bool setPluginSetting(const QString& pluginName, const QString& key, const QVariant& value) override;
+ virtual std::map<QString, QVariant> clearPluginSettings(const QString& pluginName) override;
+
private:
void setEndorsedState(MOBase::EndorsedState endorsedState);
@@ -448,6 +455,9 @@ private:
int m_NexusID;
std::set<std::pair<int, int>> m_InstalledFileIDs;
+ // List of plugin settings:
+ std::map<QString, std::map<QString, QVariant>> m_PluginSettings;
+
bool m_MetaInfoChanged;
bool m_IsAlternate;
bool m_Converted;
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-10 02:06:20 +0000