From e5b4dee1c05d0d6ebc0d7b2dd802b93cb8765e63 Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Fri, 14 Mar 2014 19:51:56 +0100 Subject: Move version stuff to the model and reimplement reordering --- gui/dialogs/OneSixModEditDialog.cpp | 60 ++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 20 deletions(-) (limited to 'gui/dialogs/OneSixModEditDialog.cpp') diff --git a/gui/dialogs/OneSixModEditDialog.cpp b/gui/dialogs/OneSixModEditDialog.cpp index 78585a05..b5a0d5aa 100644 --- a/gui/dialogs/OneSixModEditDialog.cpp +++ b/gui/dialogs/OneSixModEditDialog.cpp @@ -42,16 +42,6 @@ #include "logic/LiteLoaderInstaller.h" #include "logic/OneSixVersionBuilder.h" -template QMap invert(const QMap &in) -{ - QMap out; - for (auto it = in.begin(); it != in.end(); ++it) - { - out.insert(it.value(), it.key()); - } - return out; -} - OneSixModEditDialog::OneSixModEditDialog(OneSixInstance *inst, QWidget *parent) : QDialog(parent), ui(new Ui::OneSixModEditDialog), m_inst(inst) { @@ -164,25 +154,57 @@ void OneSixModEditDialog::on_removeLibraryBtn_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() { - // 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() { - // 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() { // FIXME: use actual model, not reloading. Move logic to model. - // FIXME: model::isCustom(); - if (QDir(m_inst->instanceRoot()).exists("custom.json")) + if (m_version->isCustom()) { if (QMessageBox::question(this, tr("Revert?"), tr("This action will remove your custom.json. Continue?")) != @@ -190,8 +212,7 @@ void OneSixModEditDialog::on_forgeBtn_clicked() { return; } - // FIXME: model::revertToBase(); - QDir(m_inst->instanceRoot()).remove("custom.json"); + m_version->revertToBase(); reloadInstanceVersion(); } VersionSelectDialog vselect(MMC->forgelist().get(), tr("Select Forge version"), this); @@ -242,8 +263,7 @@ void OneSixModEditDialog::on_forgeBtn_clicked() void OneSixModEditDialog::on_liteloaderBtn_clicked() { - // FIXME: model... - if (QDir(m_inst->instanceRoot()).exists("custom.json")) + if (m_version->isCustom()) { if (QMessageBox::question(this, tr("Revert?"), tr("This action will remove your custom.json. Continue?")) != @@ -251,7 +271,7 @@ void OneSixModEditDialog::on_liteloaderBtn_clicked() { return; } - QDir(m_inst->instanceRoot()).remove("custom.json"); + m_version->revertToBase(); reloadInstanceVersion(); } VersionSelectDialog vselect(MMC->liteloaderlist().get(), tr("Select LiteLoader version"), -- cgit From e95619fa67239b709522a66b8bb7403bb7b84098 Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Fri, 14 Mar 2014 20:48:57 +0100 Subject: Pull in BaseInstaller related changes from quickmod --- gui/dialogs/OneSixModEditDialog.cpp | 56 ++----------------- logic/BaseInstaller.h | 6 +++ logic/ForgeInstaller.cpp | 105 ++++++++++++++++++++++++++++++++++-- logic/ForgeInstaller.h | 5 +- logic/LiteLoaderInstaller.cpp | 68 ++++++++++++++++++++++- logic/LiteLoaderInstaller.h | 5 +- 6 files changed, 186 insertions(+), 59 deletions(-) (limited to 'gui/dialogs/OneSixModEditDialog.cpp') diff --git a/gui/dialogs/OneSixModEditDialog.cpp b/gui/dialogs/OneSixModEditDialog.cpp index b5a0d5aa..7dac68e5 100644 --- a/gui/dialogs/OneSixModEditDialog.cpp +++ b/gui/dialogs/OneSixModEditDialog.cpp @@ -221,44 +221,9 @@ void OneSixModEditDialog::on_forgeBtn_clicked() m_inst->currentVersionId()); if (vselect.exec() && vselect.selectedVersion()) { - ForgeVersionPtr forgeVersion = - std::dynamic_pointer_cast(vselect.selectedVersion()); - 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"; - } - } + ProgressDialog dialog(this); + dialog.exec(ForgeInstaller().createInstallTask(m_inst, vselect.selectedVersion(), this)); } - reloadInstanceVersion(); } void OneSixModEditDialog::on_liteloaderBtn_clicked() @@ -281,21 +246,8 @@ void OneSixModEditDialog::on_liteloaderBtn_clicked() m_inst->currentVersionId()); if (vselect.exec() && vselect.selectedVersion()) { - LiteLoaderVersionPtr liteloaderVersion = - std::dynamic_pointer_cast(vselect.selectedVersion()); - 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(); - } + ProgressDialog dialog(this); + dialog.exec(LiteLoaderInstaller().createInstallTask(m_inst, vselect.selectedVersion(), this)); } } diff --git a/logic/BaseInstaller.h b/logic/BaseInstaller.h index c572e004..d59833cc 100644 --- a/logic/BaseInstaller.h +++ b/logic/BaseInstaller.h @@ -20,6 +20,10 @@ class OneSixInstance; class QDir; class QString; +class QObject; +class ProgressProvider; +class BaseVersion; +typedef std::shared_ptr BaseVersionPtr; class BaseInstaller { @@ -31,6 +35,8 @@ public: virtual bool add(OneSixInstance *to); virtual bool remove(OneSixInstance *from); + virtual ProgressProvider *createInstallTask(OneSixInstance *instance, BaseVersionPtr version, QObject *parent) = 0; + protected: virtual QString id() const = 0; QString filename(const QString &root) const; diff --git a/logic/ForgeInstaller.cpp b/logic/ForgeInstaller.cpp index 6f238c21..48bfb8a3 100644 --- a/logic/ForgeInstaller.cpp +++ b/logic/ForgeInstaller.cpp @@ -24,17 +24,24 @@ #include #include #include "MultiMC.h" +#include "tasks/Task.h" #include "OneSixInstance.h" +#include "lists/ForgeVersionList.h" +#include "gui/dialogs/ProgressDialog.h" #include #include #include #include -ForgeInstaller::ForgeInstaller(QString filename, QString universal_url) +ForgeInstaller::ForgeInstaller() + : BaseInstaller() +{ +} +void ForgeInstaller::prepare(const QString &filename, const QString &universalUrl) { std::shared_ptr newVersion; - m_universal_url = universal_url; + m_universal_url = universalUrl; QuaZip zip(filename); if (!zip.open(QuaZip::mdUnzip)) @@ -111,7 +118,6 @@ ForgeInstaller::ForgeInstaller(QString filename, QString universal_url) m_forge_version = newVersion; realVersionId = m_forge_version->id = installObj.value("minecraft").toString(); } - bool ForgeInstaller::add(OneSixInstance *to) { if (!BaseInstaller::add(to)) @@ -226,3 +232,96 @@ bool ForgeInstaller::add(OneSixInstance *to) 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(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 &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" diff --git a/logic/ForgeInstaller.h b/logic/ForgeInstaller.h index df029f38..05cc994b 100644 --- a/logic/ForgeInstaller.h +++ b/logic/ForgeInstaller.h @@ -25,12 +25,15 @@ class VersionFinal; class ForgeInstaller : public BaseInstaller { public: - ForgeInstaller(QString filename, QString universal_url); + ForgeInstaller(); + void prepare(const QString &filename, const QString &universalUrl); bool add(OneSixInstance *to) override; QString id() const override { return "net.minecraftforge"; } + ProgressProvider *createInstallTask(OneSixInstance *instance, BaseVersionPtr version, QObject *parent) override; + private: // the version, read from the installer std::shared_ptr m_forge_version; diff --git a/logic/LiteLoaderInstaller.cpp b/logic/LiteLoaderInstaller.cpp index bb4b07ca..99cc5643 100644 --- a/logic/LiteLoaderInstaller.cpp +++ b/logic/LiteLoaderInstaller.cpp @@ -23,12 +23,17 @@ #include "VersionFinal.h" #include "OneSixLibrary.h" #include "OneSixInstance.h" +#include "MultiMC.h" +#include "lists/LiteLoaderVersionList.h" -LiteLoaderInstaller::LiteLoaderInstaller(LiteLoaderVersionPtr version) - : BaseInstaller(), m_version(version) +LiteLoaderInstaller::LiteLoaderInstaller() : BaseInstaller() { } +void LiteLoaderInstaller::prepare(LiteLoaderVersionPtr version) +{ + m_version = version; +} bool LiteLoaderInstaller::add(OneSixInstance *to) { if (!BaseInstaller::add(to)) @@ -84,3 +89,62 @@ bool LiteLoaderInstaller::add(OneSixInstance *to) 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(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" diff --git a/logic/LiteLoaderInstaller.h b/logic/LiteLoaderInstaller.h index 2e0de64a..3ab5acb2 100644 --- a/logic/LiteLoaderInstaller.h +++ b/logic/LiteLoaderInstaller.h @@ -25,10 +25,13 @@ class LiteLoaderInstaller : public BaseInstaller { public: - LiteLoaderInstaller(LiteLoaderVersionPtr version); + LiteLoaderInstaller(); + void prepare(LiteLoaderVersionPtr version); bool add(OneSixInstance *to) override; + ProgressProvider *createInstallTask(OneSixInstance *instance, BaseVersionPtr version, QObject *parent) override; + private: virtual QString id() const override { -- cgit From 42a85def60036a5788a9dd862d0c6f835b62337c Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Fri, 14 Mar 2014 21:18:17 +0100 Subject: Get rid of one reloadInstanceVersion --- gui/dialogs/OneSixModEditDialog.cpp | 4 ---- logic/VersionFinal.cpp | 8 ++++++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gui/dialogs/OneSixModEditDialog.cpp') diff --git a/gui/dialogs/OneSixModEditDialog.cpp b/gui/dialogs/OneSixModEditDialog.cpp index 7dac68e5..2d459001 100644 --- a/gui/dialogs/OneSixModEditDialog.cpp +++ b/gui/dialogs/OneSixModEditDialog.cpp @@ -145,10 +145,6 @@ void OneSixModEditDialog::on_removeLibraryBtn_clicked() { QMessageBox::critical(this, tr("Error"), tr("Couldn't remove file")); } - else - { - reloadInstanceVersion(); - } } } diff --git a/logic/VersionFinal.cpp b/logic/VersionFinal.cpp index 2901fcf9..d0e85c15 100644 --- a/logic/VersionFinal.cpp +++ b/logic/VersionFinal.cpp @@ -72,9 +72,13 @@ bool VersionFinal::canRemove(const int index) const } bool VersionFinal::remove(const int index) { - if (canRemove(index)) + if (canRemove(index) && QFile::remove(versionFiles.at(index)->filename)) { - return QFile::remove(versionFiles.at(index)->filename); + beginResetModel(); + versionFiles.removeAt(index); + reapply(true); + endResetModel(); + return true; } return false; } -- cgit