Merge remote-tracking branch 'origin/feature_json_fixes' into develop

This commit is contained in:
Petr Mrázek 2014-03-19 22:26:25 +01:00
commit 39d3739442
10 changed files with 393 additions and 111 deletions

View File

@ -42,16 +42,6 @@
#include "logic/LiteLoaderInstaller.h" #include "logic/LiteLoaderInstaller.h"
#include "logic/OneSixVersionBuilder.h" #include "logic/OneSixVersionBuilder.h"
template <typename A, typename B> QMap<A, B> invert(const QMap<B, A> &in)
{
QMap<A, B> out;
for (auto it = in.begin(); it != in.end(); ++it)
{
out.insert(it.value(), it.key());
}
return out;
}
OneSixModEditDialog::OneSixModEditDialog(OneSixInstance *inst, QWidget *parent) OneSixModEditDialog::OneSixModEditDialog(OneSixInstance *inst, QWidget *parent)
: QDialog(parent), ui(new Ui::OneSixModEditDialog), m_inst(inst) : QDialog(parent), ui(new Ui::OneSixModEditDialog), m_inst(inst)
{ {
@ -155,34 +145,62 @@ void OneSixModEditDialog::on_removeLibraryBtn_clicked()
{ {
QMessageBox::critical(this, tr("Error"), tr("Couldn't remove file")); QMessageBox::critical(this, tr("Error"), tr("Couldn't remove file"));
} }
else
{
reloadInstanceVersion();
}
} }
} }
void OneSixModEditDialog::on_resetLibraryOrderBtn_clicked() void OneSixModEditDialog::on_resetLibraryOrderBtn_clicked()
{ {
// FIXME: IMPLEMENT LOGIC IN MODEL. SEE LEGACY DIALOG FOR EXAMPLE(S). try
{
m_version->resetOrder();
}
catch (MMCError &e)
{
QMessageBox::critical(this, tr("Error"), e.cause());
}
} }
void OneSixModEditDialog::on_moveLibraryUpBtn_clicked() void OneSixModEditDialog::on_moveLibraryUpBtn_clicked()
{ {
// FIXME: IMPLEMENT LOGIC IN MODEL. SEE LEGACY DIALOG FOR EXAMPLE(S). if (ui->libraryTreeView->selectionModel()->selectedRows().isEmpty())
{
return;
}
try
{
const int row = ui->libraryTreeView->selectionModel()->selectedRows().first().row();
const int newRow = 0;m_version->move(row, VersionFinal::MoveUp);
//ui->libraryTreeView->selectionModel()->setCurrentIndex(m_version->index(newRow), QItemSelectionModel::ClearAndSelect);
}
catch (MMCError &e)
{
QMessageBox::critical(this, tr("Error"), e.cause());
}
} }
void OneSixModEditDialog::on_moveLibraryDownBtn_clicked() void OneSixModEditDialog::on_moveLibraryDownBtn_clicked()
{ {
// FIXME: IMPLEMENT LOGIC IN MODEL. SEE LEGACY DIALOG FOR EXAMPLE(S). if (ui->libraryTreeView->selectionModel()->selectedRows().isEmpty())
{
return;
}
try
{
const int row = ui->libraryTreeView->selectionModel()->selectedRows().first().row();
const int newRow = 0;m_version->move(row, VersionFinal::MoveDown);
//ui->libraryTreeView->selectionModel()->setCurrentIndex(m_version->index(newRow), QItemSelectionModel::ClearAndSelect);
}
catch (MMCError &e)
{
QMessageBox::critical(this, tr("Error"), e.cause());
}
} }
void OneSixModEditDialog::on_forgeBtn_clicked() void OneSixModEditDialog::on_forgeBtn_clicked()
{ {
// FIXME: use actual model, not reloading. Move logic to model. // FIXME: use actual model, not reloading. Move logic to model.
// FIXME: model::isCustom(); if (m_version->isCustom())
if (QDir(m_inst->instanceRoot()).exists("custom.json"))
{ {
if (QMessageBox::question(this, tr("Revert?"), if (QMessageBox::question(this, tr("Revert?"),
tr("This action will remove your custom.json. Continue?")) != tr("This action will remove your custom.json. Continue?")) !=
@ -190,8 +208,7 @@ void OneSixModEditDialog::on_forgeBtn_clicked()
{ {
return; return;
} }
// FIXME: model::revertToBase(); m_version->revertToBase();
QDir(m_inst->instanceRoot()).remove("custom.json");
reloadInstanceVersion(); reloadInstanceVersion();
} }
VersionSelectDialog vselect(MMC->forgelist().get(), tr("Select Forge version"), this); VersionSelectDialog vselect(MMC->forgelist().get(), tr("Select Forge version"), this);
@ -200,50 +217,14 @@ void OneSixModEditDialog::on_forgeBtn_clicked()
m_inst->currentVersionId()); m_inst->currentVersionId());
if (vselect.exec() && vselect.selectedVersion()) if (vselect.exec() && vselect.selectedVersion())
{ {
ForgeVersionPtr forgeVersion = ProgressDialog dialog(this);
std::dynamic_pointer_cast<ForgeVersion>(vselect.selectedVersion()); dialog.exec(ForgeInstaller().createInstallTask(m_inst, vselect.selectedVersion(), this));
if (!forgeVersion)
return;
auto entry = MMC->metacache()->resolveEntry("minecraftforge", forgeVersion->filename);
if (entry->stale)
{
NetJob *fjob = new NetJob("Forge download");
fjob->addNetAction(CacheDownload::make(forgeVersion->installer_url, entry));
ProgressDialog dlg(this);
dlg.exec(fjob);
if (dlg.result() == QDialog::Accepted)
{
// install
QString forgePath = entry->getFullPath();
ForgeInstaller forge(forgePath, forgeVersion->universal_url);
if (!forge.add(m_inst))
{
QLOG_ERROR() << "Failure installing forge";
} }
} }
else
{
// failed to download forge :/
}
}
else
{
// install
QString forgePath = entry->getFullPath();
ForgeInstaller forge(forgePath, forgeVersion->universal_url);
if (!forge.add(m_inst))
{
QLOG_ERROR() << "Failure installing forge";
}
}
}
reloadInstanceVersion();
}
void OneSixModEditDialog::on_liteloaderBtn_clicked() void OneSixModEditDialog::on_liteloaderBtn_clicked()
{ {
// FIXME: model... if (m_version->isCustom())
if (QDir(m_inst->instanceRoot()).exists("custom.json"))
{ {
if (QMessageBox::question(this, tr("Revert?"), if (QMessageBox::question(this, tr("Revert?"),
tr("This action will remove your custom.json. Continue?")) != tr("This action will remove your custom.json. Continue?")) !=
@ -251,7 +232,7 @@ void OneSixModEditDialog::on_liteloaderBtn_clicked()
{ {
return; return;
} }
QDir(m_inst->instanceRoot()).remove("custom.json"); m_version->revertToBase();
reloadInstanceVersion(); reloadInstanceVersion();
} }
VersionSelectDialog vselect(MMC->liteloaderlist().get(), tr("Select LiteLoader version"), VersionSelectDialog vselect(MMC->liteloaderlist().get(), tr("Select LiteLoader version"),
@ -261,21 +242,8 @@ void OneSixModEditDialog::on_liteloaderBtn_clicked()
m_inst->currentVersionId()); m_inst->currentVersionId());
if (vselect.exec() && vselect.selectedVersion()) if (vselect.exec() && vselect.selectedVersion())
{ {
LiteLoaderVersionPtr liteloaderVersion = ProgressDialog dialog(this);
std::dynamic_pointer_cast<LiteLoaderVersion>(vselect.selectedVersion()); dialog.exec(LiteLoaderInstaller().createInstallTask(m_inst, vselect.selectedVersion(), this));
if (!liteloaderVersion)
return;
LiteLoaderInstaller liteloader(liteloaderVersion);
if (!liteloader.add(m_inst))
{
QMessageBox::critical(this, tr("LiteLoader"),
tr("For reasons unknown, the LiteLoader installation failed. "
"Check your MultiMC log files for details."));
}
else
{
reloadInstanceVersion();
}
} }
} }

View File

@ -99,9 +99,6 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="moveLibraryUpBtn"> <widget class="QPushButton" name="moveLibraryUpBtn">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip"> <property name="toolTip">
<string>This isn't implemented yet.</string> <string>This isn't implemented yet.</string>
</property> </property>
@ -112,9 +109,6 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="moveLibraryDownBtn"> <widget class="QPushButton" name="moveLibraryDownBtn">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip"> <property name="toolTip">
<string>This isn't implemented yet.</string> <string>This isn't implemented yet.</string>
</property> </property>
@ -125,9 +119,6 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="resetLibraryOrderBtn"> <widget class="QPushButton" name="resetLibraryOrderBtn">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip"> <property name="toolTip">
<string>This isn't implemented yet.</string> <string>This isn't implemented yet.</string>
</property> </property>

View File

@ -20,6 +20,10 @@
class OneSixInstance; class OneSixInstance;
class QDir; class QDir;
class QString; class QString;
class QObject;
class ProgressProvider;
class BaseVersion;
typedef std::shared_ptr<BaseVersion> BaseVersionPtr;
class BaseInstaller class BaseInstaller
{ {
@ -31,6 +35,8 @@ public:
virtual bool add(OneSixInstance *to); virtual bool add(OneSixInstance *to);
virtual bool remove(OneSixInstance *from); virtual bool remove(OneSixInstance *from);
virtual ProgressProvider *createInstallTask(OneSixInstance *instance, BaseVersionPtr version, QObject *parent) = 0;
protected: protected:
virtual QString id() const = 0; virtual QString id() const = 0;
QString filename(const QString &root) const; QString filename(const QString &root) const;

View File

@ -24,17 +24,24 @@
#include <QRegularExpression> #include <QRegularExpression>
#include <QRegularExpressionMatch> #include <QRegularExpressionMatch>
#include "MultiMC.h" #include "MultiMC.h"
#include "tasks/Task.h"
#include "OneSixInstance.h" #include "OneSixInstance.h"
#include "lists/ForgeVersionList.h"
#include "gui/dialogs/ProgressDialog.h"
#include <QJsonDocument> #include <QJsonDocument>
#include <QJsonArray> #include <QJsonArray>
#include <QSaveFile> #include <QSaveFile>
#include <QCryptographicHash> #include <QCryptographicHash>
ForgeInstaller::ForgeInstaller(QString filename, QString universal_url) ForgeInstaller::ForgeInstaller()
: BaseInstaller()
{
}
void ForgeInstaller::prepare(const QString &filename, const QString &universalUrl)
{ {
std::shared_ptr<VersionFinal> newVersion; std::shared_ptr<VersionFinal> newVersion;
m_universal_url = universal_url; m_universal_url = universalUrl;
QuaZip zip(filename); QuaZip zip(filename);
if (!zip.open(QuaZip::mdUnzip)) if (!zip.open(QuaZip::mdUnzip))
@ -111,7 +118,6 @@ ForgeInstaller::ForgeInstaller(QString filename, QString universal_url)
m_forge_version = newVersion; m_forge_version = newVersion;
realVersionId = m_forge_version->id = installObj.value("minecraft").toString(); realVersionId = m_forge_version->id = installObj.value("minecraft").toString();
} }
bool ForgeInstaller::add(OneSixInstance *to) bool ForgeInstaller::add(OneSixInstance *to)
{ {
if (!BaseInstaller::add(to)) if (!BaseInstaller::add(to))
@ -226,3 +232,96 @@ bool ForgeInstaller::add(OneSixInstance *to)
return true; return true;
} }
class ForgeInstallTask : public Task
{
Q_OBJECT
public:
ForgeInstallTask(ForgeInstaller *installer, OneSixInstance *instance, BaseVersionPtr version, QObject *parent = 0)
: Task(parent), m_installer(installer), m_instance(instance), m_version(version)
{
}
protected:
void executeTask() override
{
{
setStatus(tr("Installing forge..."));
ForgeVersionPtr forgeVersion =
std::dynamic_pointer_cast<ForgeVersion>(m_version);
if (!forgeVersion)
{
emitFailed(tr("Unknown error occured"));
return;
}
auto entry = MMC->metacache()->resolveEntry("minecraftforge", forgeVersion->filename);
if (entry->stale)
{
NetJob *fjob = new NetJob("Forge download");
fjob->addNetAction(CacheDownload::make(forgeVersion->installer_url, entry));
connect(fjob, &NetJob::progress, [this](qint64 current, qint64 total){setProgress(100 * current / qMax((qint64)1, total));});
connect(fjob, &NetJob::status, [this](const QString &msg){setStatus(msg);});
connect(fjob, &NetJob::failed, [this](){emitFailed(tr("Failure to download forge"));});
connect(fjob, &NetJob::succeeded, [this, entry, forgeVersion]()
{
if (!install(entry, forgeVersion))
{
QLOG_ERROR() << "Failure installing forge";
emitFailed(tr("Failure to install forge"));
}
else
{
reload();
}
});
}
else
{
if (!install(entry, forgeVersion))
{
QLOG_ERROR() << "Failure installing forge";
emitFailed(tr("Failure to install forge"));
}
else
{
reload();
}
}
}
}
bool install(const std::shared_ptr<MetaEntry> &entry, const ForgeVersionPtr &forgeVersion)
{
QString forgePath = entry->getFullPath();
m_installer->prepare(forgePath, forgeVersion->universal_url);
return m_installer->add(m_instance);
}
void reload()
{
try
{
m_instance->reloadVersion();
emitSucceeded();
}
catch (MMCError &e)
{
emitFailed(e.cause());
}
catch (...)
{
emitFailed(tr("Failed to load the version description file for reasons unknown."));
}
}
private:
ForgeInstaller *m_installer;
OneSixInstance *m_instance;
BaseVersionPtr m_version;
};
ProgressProvider *ForgeInstaller::createInstallTask(OneSixInstance *instance, BaseVersionPtr version, QObject *parent)
{
return new ForgeInstallTask(this, instance, version, parent);
}
#include "ForgeInstaller.moc"

View File

@ -25,12 +25,15 @@ class VersionFinal;
class ForgeInstaller : public BaseInstaller class ForgeInstaller : public BaseInstaller
{ {
public: public:
ForgeInstaller(QString filename, QString universal_url); ForgeInstaller();
void prepare(const QString &filename, const QString &universalUrl);
bool add(OneSixInstance *to) override; bool add(OneSixInstance *to) override;
QString id() const override { return "net.minecraftforge"; } QString id() const override { return "net.minecraftforge"; }
ProgressProvider *createInstallTask(OneSixInstance *instance, BaseVersionPtr version, QObject *parent) override;
private: private:
// the version, read from the installer // the version, read from the installer
std::shared_ptr<VersionFinal> m_forge_version; std::shared_ptr<VersionFinal> m_forge_version;

View File

@ -23,12 +23,17 @@
#include "VersionFinal.h" #include "VersionFinal.h"
#include "OneSixLibrary.h" #include "OneSixLibrary.h"
#include "OneSixInstance.h" #include "OneSixInstance.h"
#include "MultiMC.h"
#include "lists/LiteLoaderVersionList.h"
LiteLoaderInstaller::LiteLoaderInstaller(LiteLoaderVersionPtr version) LiteLoaderInstaller::LiteLoaderInstaller() : BaseInstaller()
: BaseInstaller(), m_version(version)
{ {
} }
void LiteLoaderInstaller::prepare(LiteLoaderVersionPtr version)
{
m_version = version;
}
bool LiteLoaderInstaller::add(OneSixInstance *to) bool LiteLoaderInstaller::add(OneSixInstance *to)
{ {
if (!BaseInstaller::add(to)) if (!BaseInstaller::add(to))
@ -84,3 +89,62 @@ bool LiteLoaderInstaller::add(OneSixInstance *to)
return true; return true;
} }
class LiteLoaderInstallTask : public Task
{
Q_OBJECT
public:
LiteLoaderInstallTask(LiteLoaderInstaller *installer, OneSixInstance *instance,
BaseVersionPtr version, QObject *parent)
: Task(parent), m_installer(installer), m_instance(instance), m_version(version)
{
}
protected:
void executeTask() override
{
LiteLoaderVersionPtr liteloaderVersion =
std::dynamic_pointer_cast<LiteLoaderVersion>(m_version);
if (!liteloaderVersion)
{
return;
}
m_installer->prepare(liteloaderVersion);
if (!m_installer->add(m_instance))
{
emitFailed(tr("For reasons unknown, the LiteLoader installation failed. Check your "
"MultiMC log files for details."));
}
else
{
try
{
m_instance->reloadVersion();
emitSucceeded();
}
catch (MMCError &e)
{
emitFailed(e.cause());
}
catch (...)
{
emitFailed(
tr("Failed to load the version description file for reasons unknown."));
}
}
}
private:
LiteLoaderInstaller *m_installer;
OneSixInstance *m_instance;
BaseVersionPtr m_version;
};
ProgressProvider *LiteLoaderInstaller::createInstallTask(OneSixInstance *instance,
BaseVersionPtr version,
QObject *parent)
{
return new LiteLoaderInstallTask(this, instance, version, parent);
}
#include "LiteLoaderInstaller.moc"

View File

@ -25,10 +25,13 @@
class LiteLoaderInstaller : public BaseInstaller class LiteLoaderInstaller : public BaseInstaller
{ {
public: public:
LiteLoaderInstaller(LiteLoaderVersionPtr version); LiteLoaderInstaller();
void prepare(LiteLoaderVersionPtr version);
bool add(OneSixInstance *to) override; bool add(OneSixInstance *to) override;
ProgressProvider *createInstallTask(OneSixInstance *instance, BaseVersionPtr version, QObject *parent) override;
private: private:
virtual QString id() const override virtual QString id() const override
{ {

View File

@ -58,13 +58,15 @@ void OneSixVersionBuilder::readJsonAndApplyToVersion(VersionFinal *version,
void OneSixVersionBuilder::buildInternal(const bool onlyVanilla, const QStringList &external) void OneSixVersionBuilder::buildInternal(const bool onlyVanilla, const QStringList &external)
{ {
m_version->clear(); m_version->versionFiles.clear();
QDir root(m_instance->instanceRoot()); QDir root(m_instance->instanceRoot());
QDir patches(root.absoluteFilePath("patches/")); QDir patches(root.absoluteFilePath("patches/"));
// if we do external files, do just those. // if we do external files, do just those.
if (!external.isEmpty()) if (!external.isEmpty())
{
int externalOrder = -1;
for (auto fileName : external) for (auto fileName : external)
{ {
QLOG_INFO() << "Reading" << fileName; QLOG_INFO() << "Reading" << fileName;
@ -72,11 +74,12 @@ void OneSixVersionBuilder::buildInternal(const bool onlyVanilla, const QStringLi
parseJsonFile(QFileInfo(fileName), false, fileName.endsWith("pack.json")); parseJsonFile(QFileInfo(fileName), false, fileName.endsWith("pack.json"));
file->name = QFileInfo(fileName).fileName(); file->name = QFileInfo(fileName).fileName();
file->fileId = "org.multimc.external." + file->name; file->fileId = "org.multimc.external." + file->name;
file->order = (externalOrder += 1);
file->version = QString(); file->version = QString();
file->mcVersion = QString(); file->mcVersion = QString();
file->applyTo(m_version);
m_version->versionFiles.append(file); m_version->versionFiles.append(file);
} }
}
// else, if there's custom json, we just do that. // else, if there's custom json, we just do that.
else if (QFile::exists(root.absoluteFilePath("custom.json"))) else if (QFile::exists(root.absoluteFilePath("custom.json")))
{ {
@ -85,8 +88,8 @@ void OneSixVersionBuilder::buildInternal(const bool onlyVanilla, const QStringLi
file->name = "custom.json"; file->name = "custom.json";
file->filename = "custom.json"; file->filename = "custom.json";
file->fileId = "org.multimc.custom.json"; file->fileId = "org.multimc.custom.json";
file->order = -1;
file->version = QString(); file->version = QString();
file->applyTo(m_version);
m_version->versionFiles.append(file); m_version->versionFiles.append(file);
// QObject::tr("The version descriptors of this instance are not compatible with the // QObject::tr("The version descriptors of this instance are not compatible with the
// current version of MultiMC")); // current version of MultiMC"));
@ -101,9 +104,9 @@ void OneSixVersionBuilder::buildInternal(const bool onlyVanilla, const QStringLi
auto file = parseJsonFile(QFileInfo(root.absoluteFilePath("version.json")), false); auto file = parseJsonFile(QFileInfo(root.absoluteFilePath("version.json")), false);
file->name = "Minecraft"; file->name = "Minecraft";
file->fileId = "org.multimc.version.json"; file->fileId = "org.multimc.version.json";
file->order = -1;
file->version = m_instance->intendedVersionId(); file->version = m_instance->intendedVersionId();
file->mcVersion = m_instance->intendedVersionId(); file->mcVersion = m_instance->intendedVersionId();
file->applyTo(m_version);
m_version->versionFiles.append(file); m_version->versionFiles.append(file);
// QObject::tr("Error while applying %1. Please check MultiMC-0.log for more // QObject::tr("Error while applying %1. Please check MultiMC-0.log for more
// info.").arg(root.absoluteFilePath("version.json"))); // info.").arg(root.absoluteFilePath("version.json")));
@ -128,9 +131,7 @@ void OneSixVersionBuilder::buildInternal(const bool onlyVanilla, const QStringLi
} }
for (auto order : files.keys()) for (auto order : files.keys())
{ {
QLOG_DEBUG() << "Applying file with order" << order;
auto &filePair = files[order]; auto &filePair = files[order];
filePair.second->applyTo(m_version);
m_version->versionFiles.append(filePair.second); m_version->versionFiles.append(filePair.second);
} }
} while (0); } while (0);

View File

@ -17,8 +17,20 @@
#include <QDebug> #include <QDebug>
#include <QFile> #include <QFile>
#include <QDir>
#include "OneSixVersionBuilder.h" #include "OneSixVersionBuilder.h"
#include "OneSixInstance.h"
template <typename A, typename B> QMap<A, B> invert(const QMap<B, A> &in)
{
QMap<A, B> out;
for (auto it = in.begin(); it != in.end(); ++it)
{
out.insert(it.value(), it.key());
}
return out;
}
VersionFinal::VersionFinal(OneSixInstance *instance, QObject *parent) VersionFinal::VersionFinal(OneSixInstance *instance, QObject *parent)
: QAbstractListModel(parent), m_instance(instance) : QAbstractListModel(parent), m_instance(instance)
@ -31,12 +43,12 @@ bool VersionFinal::reload(const bool onlyVanilla, const QStringList &external)
//FIXME: source of epic failure. //FIXME: source of epic failure.
beginResetModel(); beginResetModel();
OneSixVersionBuilder::build(this, m_instance, onlyVanilla, external); OneSixVersionBuilder::build(this, m_instance, onlyVanilla, external);
reapply(true);
endResetModel(); endResetModel();
} }
void VersionFinal::clear() void VersionFinal::clear()
{ {
beginResetModel();
id.clear(); id.clear();
time.clear(); time.clear();
releaseTime.clear(); releaseTime.clear();
@ -48,8 +60,6 @@ void VersionFinal::clear()
mainClass.clear(); mainClass.clear();
libraries.clear(); libraries.clear();
tweakers.clear(); tweakers.clear();
versionFiles.clear();
endResetModel();
} }
bool VersionFinal::canRemove(const int index) const bool VersionFinal::canRemove(const int index) const
@ -60,6 +70,18 @@ bool VersionFinal::canRemove(const int index) const
} }
return false; return false;
} }
bool VersionFinal::remove(const int index)
{
if (canRemove(index) && QFile::remove(versionFiles.at(index)->filename))
{
beginResetModel();
versionFiles.removeAt(index);
reapply(true);
endResetModel();
return true;
}
return false;
}
QString VersionFinal::versionFileId(const int index) const QString VersionFinal::versionFileId(const int index) const
{ {
@ -69,14 +91,16 @@ QString VersionFinal::versionFileId(const int index) const
} }
return versionFiles.at(index)->fileId; return versionFiles.at(index)->fileId;
} }
VersionFilePtr VersionFinal::versionFile(const QString &id)
bool VersionFinal::remove(const int index)
{ {
if (canRemove(index)) for (auto file : versionFiles)
{ {
return QFile::remove(versionFiles.at(index)->filename); if (file->fileId == id)
{
return file;
} }
return false; }
return 0;
} }
QList<std::shared_ptr<OneSixLibrary> > VersionFinal::getActiveNormalLibs() QList<std::shared_ptr<OneSixLibrary> > VersionFinal::getActiveNormalLibs()
@ -91,7 +115,6 @@ QList<std::shared_ptr<OneSixLibrary> > VersionFinal::getActiveNormalLibs()
} }
return output; return output;
} }
QList<std::shared_ptr<OneSixLibrary> > VersionFinal::getActiveNativeLibs() QList<std::shared_ptr<OneSixLibrary> > VersionFinal::getActiveNativeLibs()
{ {
QList<std::shared_ptr<OneSixLibrary> > output; QList<std::shared_ptr<OneSixLibrary> > output;
@ -144,7 +167,6 @@ QVariant VersionFinal::data(const QModelIndex &index, int role) const
} }
return QVariant(); return QVariant();
} }
QVariant VersionFinal::headerData(int section, Qt::Orientation orientation, int role) const QVariant VersionFinal::headerData(int section, Qt::Orientation orientation, int role) const
{ {
if (orientation == Qt::Horizontal) if (orientation == Qt::Horizontal)
@ -164,7 +186,6 @@ QVariant VersionFinal::headerData(int section, Qt::Orientation orientation, int
} }
return QVariant(); return QVariant();
} }
Qt::ItemFlags VersionFinal::flags(const QModelIndex &index) const Qt::ItemFlags VersionFinal::flags(const QModelIndex &index) const
{ {
if (!index.isValid()) if (!index.isValid())
@ -181,3 +202,117 @@ int VersionFinal::columnCount(const QModelIndex &parent) const
{ {
return 2; return 2;
} }
bool VersionFinal::isCustom()
{
return QDir(m_instance->instanceRoot()).exists("custom.json");
}
bool VersionFinal::revertToBase()
{
return QDir(m_instance->instanceRoot()).remove("custom.json");
}
QMap<QString, int> VersionFinal::getExistingOrder() const
{
QMap<QString, int> order;
// default
{
for (auto file : versionFiles)
{
order.insert(file->fileId, file->order);
}
}
// overriden
{
QMap<QString, int> overridenOrder = OneSixVersionBuilder::readOverrideOrders(m_instance);
for (auto id : order.keys())
{
if (overridenOrder.contains(id))
{
order[id] = overridenOrder[id];
}
}
}
return order;
}
void VersionFinal::move(const int index, const MoveDirection direction)
{
int theirIndex;
if (direction == MoveUp)
{
theirIndex = index - 1;
}
else
{
theirIndex = index + 1;
}
if (theirIndex < 0 || theirIndex >= versionFiles.size())
{
return;
}
const QString ourId = versionFileId(index);
const QString theirId = versionFileId(theirIndex);
if (ourId.isNull() || ourId.startsWith("org.multimc.") ||
theirId.isNull() || theirId.startsWith("org.multimc."))
{
return;
}
VersionFilePtr we = versionFiles[index];
VersionFilePtr them = versionFiles[theirIndex];
if (!we || !them)
{
return;
}
beginMoveRows(QModelIndex(), index, index, QModelIndex(), theirIndex);
versionFiles.replace(theirIndex, we);
versionFiles.replace(index, them);
endMoveRows();
auto order = getExistingOrder();
order[ourId] = theirIndex;
order[theirId] = index;
if (!OneSixVersionBuilder::writeOverrideOrders(order, m_instance))
{
throw MMCError(tr("Couldn't save the new order"));
}
else
{
reapply();
}
}
void VersionFinal::resetOrder()
{
QDir(m_instance->instanceRoot()).remove("order.json");
reapply();
}
void VersionFinal::reapply(const bool alreadyReseting)
{
if (!alreadyReseting)
{
beginResetModel();
}
clear();
auto existingOrders = getExistingOrder();
QList<int> orders = existingOrders.values();
std::sort(orders.begin(), orders.end());
QList<VersionFilePtr> newVersionFiles;
for (auto order : orders)
{
auto file = versionFile(existingOrders.key(order));
newVersionFiles.append(file);
file->applyTo(this);
}
versionFiles.swap(newVersionFiles);
if (!alreadyReseting)
{
endResetModel();
}
}

View File

@ -41,12 +41,22 @@ public:
bool reload(const bool onlyVanilla = false, const QStringList &external = QStringList()); bool reload(const bool onlyVanilla = false, const QStringList &external = QStringList());
void clear(); void clear();
void dump() const;
bool canRemove(const int index) const; bool canRemove(const int index) const;
QString versionFileId(const int index) const; QString versionFileId(const int index) const;
// does this instance have an all overriding custom.json
bool isCustom();
// remove custom.json
bool revertToBase();
enum MoveDirection { MoveUp, MoveDown };
void move(const int index, const MoveDirection direction);
void resetOrder();
// clears and reapplies all version files
void reapply(const bool alreadyReseting = false);
public public
slots: slots:
bool remove(const int index); bool remove(const int index);
@ -120,7 +130,9 @@ public:
// QList<Rule> rules; // QList<Rule> rules;
QList<VersionFilePtr> versionFiles; QList<VersionFilePtr> versionFiles;
VersionFilePtr versionFile(const QString &id);
private: private:
OneSixInstance *m_instance; OneSixInstance *m_instance;
QMap<QString, int> getExistingOrder() const;
}; };