Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactoring of game features for better management. #8

Merged
merged 2 commits into from
Jun 9, 2024
Merged

Refactoring of game features for better management. #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fe5ee5
Refactoring following uibase change for game features.
Holt59 May 31, 2024
34c40e6
Refactoring following uibase change for game features.
Holt59 Jun 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions src/base_script.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#include "imoinfo.h"
#include "iplugingame.h"
#include "ipluginlist.h"
#include "igamefeatures.h"
#include "iinstallationmanager.h"
#include "log.h"

#include "scriptextender.h"

#include "psettings.h"
Expand All @@ -59,7 +59,7 @@ namespace CSharp {
std::shared_ptr<IFileTree> DestinationTree;

// Map from path in destination entry to the original entry:
std::map<std::shared_ptr<const FileTreeEntry>,
std::map<std::shared_ptr<const FileTreeEntry>,
std::shared_ptr<const FileTreeEntry>> InstalledEntries;

// Map extracted entries (in the original tree) to (temporary) paths:
Expand All @@ -73,9 +73,9 @@ namespace CSharp {

Globals() { }
Globals(
IPlugin const* plugin,MOBase::IInstallationManager* manager, QWidget* parentWidget,
IPlugin const* plugin, MOBase::IInstallationManager* manager, QWidget* parentWidget,
std::shared_ptr<MOBase::IFileTree> tree, std::map<std::shared_ptr<const FileTreeEntry>, QString> entries) :
m_Plugin(plugin), InstallManager(manager), ParentWidget(parentWidget), SourceTree(tree), DestinationTree(tree->createOrphanTree()), ExtractedEntries(std::move(entries)) {
m_Plugin(plugin), InstallManager(manager), ParentWidget(parentWidget), SourceTree(tree), DestinationTree(tree->createOrphanTree()), ExtractedEntries(std::move(entries)) {

}

Expand Down Expand Up @@ -103,7 +103,7 @@ namespace CSharp {
g_Organizer = moInfo;
}

void beforeInstall(IPlugin const* plugin, MOBase::IInstallationManager* manager, QWidget* parentWidget,
void beforeInstall(IPlugin const* plugin, MOBase::IInstallationManager* manager, QWidget* parentWidget,
std::shared_ptr<MOBase::IFileTree> tree, std::map<std::shared_ptr<const FileTreeEntry>, QString> entries) {
g = { plugin, manager, parentWidget, tree, std::move(entries) };
}
Expand All @@ -123,10 +123,10 @@ namespace CSharp {

switch (dialog->result()) {

// Discard, nothing do to:
// Discard, nothing do to:
case InstallerFomodPostDialog::Result::DISCARD: break;

// Apply, must fetch the profile INI settings and apply the settings:
// Apply, must fetch the profile INI settings and apply the settings:
case InstallerFomodPostDialog::Result::APPLY: {
for (auto& p : g.Settings) {
QDir path(g_Organizer->profilePath());
Expand All @@ -144,7 +144,7 @@ namespace CSharp {
}
} break;

// Move, must create the INI files and apply the settings:
// Move, must create the INI files and apply the settings:
case InstallerFomodPostDialog::Result::MOVE: {
for (auto& p : g.Settings) {
auto e = g.DestinationTree->addFile("INI Tweaks/" + p.first, false);
Expand Down Expand Up @@ -186,7 +186,7 @@ namespace CSharp {
}

bool BaseScriptImpl::PerformBasicInstall() {
for (auto e: *g.SourceTree) {
for (auto e : *g.SourceTree) {
if (!isFomodEntry(e)) {
auto ce = g.DestinationTree->copy(e, "", IFileTree::InsertPolicy::MERGE);
g.InstalledEntries[ce] = e;
Expand Down Expand Up @@ -223,7 +223,7 @@ namespace CSharp {
paths.push_back(path + entry->name());
}
return IFileTree::WalkReturn::CONTINUE;
}, "/");
}, "/");

// Convert to C#:
array<String^>^ result = gcnew array<String^>(paths.size());
Expand Down Expand Up @@ -282,7 +282,7 @@ namespace CSharp {
QStringList getDataFiles(QString folder, QString pattern, bool allFolders) {
QStringList files = g_Organizer->findFiles(folder, [pattern](QString const& filepath) {
return QDir::match(pattern, QFileInfo(filepath).fileName());
});
});
if (allFolders) {
QStringList directories = g_Organizer->listDirectories(folder);
for (QString directory : directories) {
Expand Down Expand Up @@ -319,11 +319,11 @@ namespace CSharp {
* file was not found.
*/
String^ getDataFilePath(String^ p_strPath) {

// Check if the file is in the output tree:
QString qPath = to_qstring(p_strPath);
if (auto e = g.DestinationTree->find(qPath); e != nullptr) {

// Check if it's a created entry:
if (auto it = g.CreatedEntries.find(e); it != g.CreatedEntries.end()) {
return from_string(g.CreatedEntries[e]);
Expand Down Expand Up @@ -359,7 +359,7 @@ namespace CSharp {
auto path = std::filesystem::path(qPath.toStdWString()).make_preferred();
QStringList paths = g_Organizer->findFiles(ToQString(path.parent_path().native()), [name = ToQString(path.filename())](QString const& filepath) {
return QFileInfo(filepath).fileName().compare(name, Qt::CaseInsensitive) == 0;
});
});

if (paths.isEmpty()) {
return nullptr;
Expand Down Expand Up @@ -502,8 +502,8 @@ namespace CSharp {
array<int>^ BaseScriptImpl::Select(array<SelectOption^>^ p_sopOptions, String^ p_strTitle, bool p_booSelectMany) {
using namespace System::Collections::Generic;

QDialog *inputDialog = new QDialog();
QVBoxLayout *layout = new QVBoxLayout(inputDialog);
QDialog* inputDialog = new QDialog();
QVBoxLayout* layout = new QVBoxLayout(inputDialog);
inputDialog->setWindowTitle(to_qstring(p_strTitle));
inputDialog->setLayout(layout);

Expand Down Expand Up @@ -533,12 +533,12 @@ namespace CSharp {
layout->addWidget(btn);
items.append(btn);
}

if (!p_booSelectMany && items.size() > 0) {
items[0]->setChecked(true);
}

QDialogButtonBox *buttonBox = new QDialogButtonBox(
QDialogButtonBox* buttonBox = new QDialogButtonBox(
QDialogButtonBox::Cancel | QDialogButtonBox::Ok, inputDialog);
layout->addWidget(buttonBox);

Expand All @@ -561,7 +561,7 @@ namespace CSharp {

return selected->ToArray();
}

// Versioning / INIs:

// Convert to Version^ from a MO2 version:
Expand All @@ -580,7 +580,7 @@ namespace CSharp {
}

Version^ BaseScriptImpl::GetScriptExtenderVersion() {
auto scriptExtender = g_Organizer->managedGame()->feature<ScriptExtender>();
auto scriptExtender = g_Organizer->gameFeatures()->gameFeature<ScriptExtender>();

if (!scriptExtender || !scriptExtender->isInstalled()) {
return nullptr;
Expand All @@ -590,7 +590,7 @@ namespace CSharp {
}

bool BaseScriptImpl::ScriptExtenderPresent() {
auto scriptExtender = g_Organizer->managedGame()->feature<ScriptExtender>();
auto scriptExtender = g_Organizer->gameFeatures()->gameFeature<ScriptExtender>();
return scriptExtender && scriptExtender->isInstalled();
}

Expand Down Expand Up @@ -619,7 +619,7 @@ namespace CSharp {
}
return result;
}

// INIs:
String^ BaseScriptImpl::GetIniString(String^ settingsFileName, String^ section, String^ key) {

Expand All @@ -639,7 +639,7 @@ namespace CSharp {
}

QSettings settings(path.filePath(to_qstring(settingsFileName)), QSettings::IniFormat);

if (settings.status() != QSettings::NoError) {
return nullptr;
}
Expand All @@ -655,7 +655,7 @@ namespace CSharp {
}

return from_string(value.toString().toStdString());
}
}

int BaseScriptImpl::GetIniInt(String^ settingsFileName, String^ section, String^ key) {
return Convert::ToInt32(GetIniString(settingsFileName, section, key));
Expand Down