From efa8e26a3f3f7ba5e536cd10e86303b4fe1baba0 Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Sat, 15 Feb 2014 14:19:35 +0100 Subject: Profiler support. Currently JProfiler and JVisualVM are implemented. --- CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e7dea67..2dd5dde5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -498,6 +498,14 @@ logic/assets/AssetsMigrateTask.h logic/assets/AssetsMigrateTask.cpp logic/assets/AssetsUtils.h logic/assets/AssetsUtils.cpp + +# Profiling +logic/profiler/BaseProfiler.h +logic/profiler/BaseProfiler.cpp +logic/profiler/JProfiler.h +logic/profiler/JProfiler.cpp +logic/profiler/JVisualVM.h +logic/profiler/JVisualVM.cpp ) -- cgit From 616c37269053bc4f111792dbb9374cc119a58339 Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Sun, 16 Feb 2014 10:46:14 +0100 Subject: Fix more stuff. Detached tools, only MCEdit for now. --- CMakeLists.txt | 6 +++- MultiMC.cpp | 7 +++++ MultiMC.h | 6 ++++ gui/MainWindow.cpp | 29 ++++++++++++++++++- gui/dialogs/SettingsDialog.cpp | 28 +++++++++++++++++++ gui/dialogs/SettingsDialog.h | 2 ++ gui/dialogs/SettingsDialog.ui | 34 ++++++++++++++++++++-- logic/BaseExternalTool.cpp | 47 +++++++++++++++++++++++++++++++ logic/BaseExternalTool.h | 56 +++++++++++++++++++++++++++++++++++++ logic/MCEditTool.cpp | 62 +++++++++++++++++++++++++++++++++++++++++ logic/MCEditTool.h | 23 +++++++++++++++ logic/profiler/BaseProfiler.cpp | 22 ++------------- logic/profiler/BaseProfiler.h | 21 +++----------- logic/profiler/JProfiler.cpp | 2 +- logic/profiler/JProfiler.h | 2 +- logic/profiler/JVisualVM.cpp | 2 +- logic/profiler/JVisualVM.h | 2 +- 17 files changed, 307 insertions(+), 44 deletions(-) create mode 100644 logic/BaseExternalTool.cpp create mode 100644 logic/BaseExternalTool.h create mode 100644 logic/MCEditTool.cpp create mode 100644 logic/MCEditTool.h (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 2dd5dde5..58d01eb8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -499,7 +499,11 @@ logic/assets/AssetsMigrateTask.cpp logic/assets/AssetsUtils.h logic/assets/AssetsUtils.cpp -# Profiling +# Profiling and tools +logic/BaseExternalTool.h +logic/BaseExternalTool.cpp +logic/MCEditTool.h +logic/MCEditTool.cpp logic/profiler/BaseProfiler.h logic/profiler/BaseProfiler.cpp logic/profiler/JProfiler.h diff --git a/MultiMC.cpp b/MultiMC.cpp index e3f60049..c813c425 100644 --- a/MultiMC.cpp +++ b/MultiMC.cpp @@ -33,6 +33,7 @@ #include "logic/profiler/JProfiler.h" #include "logic/profiler/JVisualVM.h" +#include "logic/MCEditTool.h" #include "pathutils.h" #include "cmdutils.h" @@ -223,6 +224,12 @@ MultiMC::MultiMC(int &argc, char **argv, bool root_override) { profiler->registerSettings(m_settings.get()); } + m_tools.insert("mcedit", + std::shared_ptr(new MCEditFactory())); + for (auto tool : m_tools.values()) + { + tool->registerSettings(m_settings.get()); + } // launch instance, if that's what should be done // WARNING: disabled until further notice diff --git a/MultiMC.h b/MultiMC.h index 854de59b..753ab3b4 100644 --- a/MultiMC.h +++ b/MultiMC.h @@ -23,6 +23,7 @@ class NotificationChecker; class NewsChecker; class StatusChecker; class BaseProfilerFactory; +class BaseDetachedToolFactory; #if defined(MMC) #undef MMC @@ -132,6 +133,10 @@ public: { return m_profilers; } + QMap> tools() + { + return m_tools; + } void installUpdates(const QString updateFilesDir, UpdateFlags flags = None); @@ -205,6 +210,7 @@ private: std::shared_ptr m_minecraftlist; std::shared_ptr m_javalist; QMap> m_profilers; + QMap> m_tools; QsLogging::DestinationPtr m_fileDestination; QsLogging::DestinationPtr m_debugDestination; diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index b05c58f7..3f469061 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -1440,7 +1440,34 @@ void MainWindow::instanceChanged(const QModelIndex ¤t, const QModelIndex & for (auto profiler : MMC->profilers().values()) { QAction *profilerAction = launchMenu->addAction(profiler->name()); - connect(profilerAction, &QAction::triggered, [this, profiler](){doLaunch(true, profiler.get());}); + QString error; + if (!profiler->check(&error)) + { + profilerAction->setDisabled(true); + profilerAction->setToolTip(tr("Profiler not setup correctly. Go into settings, \"External Tools\".")); + } + else + { + connect(profilerAction, &QAction::triggered, [this, profiler](){doLaunch(true, profiler.get());}); + } + } + launchMenu->addSeparator()->setText(tr("Tools")); + for (auto tool : MMC->tools().values()) + { + QAction *toolAction = launchMenu->addAction(tool->name()); + QString error; + if (!tool->check(&error)) + { + toolAction->setDisabled(true); + toolAction->setToolTip(tr("Tool not setup correctly. Go into settings, \"External Tools\".")); + } + else + { + connect(toolAction, &QAction::triggered, [this, tool]() + { + tool->createDetachedTool(m_selectedInstance, this)->run(); + }); + } } ui->actionLaunchInstance->setMenu(launchMenu); diff --git a/gui/dialogs/SettingsDialog.cpp b/gui/dialogs/SettingsDialog.cpp index 7afb6565..9423d7eb 100644 --- a/gui/dialogs/SettingsDialog.cpp +++ b/gui/dialogs/SettingsDialog.cpp @@ -374,6 +374,7 @@ void SettingsDialog::applySettings(SettingsObject *s) // Profilers s->set("JProfilerPath", ui->jprofilerPathEdit->text()); s->set("JVisualVMPath", ui->jvisualvmPathEdit->text()); + s->set("MCEditPath", ui->mceditPathEdit->text()); } void SettingsDialog::loadSettings(SettingsObject *s) @@ -457,6 +458,7 @@ void SettingsDialog::loadSettings(SettingsObject *s) // Profilers ui->jprofilerPathEdit->setText(s->get("JProfilerPath").toString()); ui->jvisualvmPathEdit->setText(s->get("JVisualVMPath").toString()); + ui->mceditPathEdit->setText(s->get("MCEditPath").toString()); } void SettingsDialog::on_javaDetectBtn_clicked() @@ -565,3 +567,29 @@ void SettingsDialog::on_jvisualvmCheckBtn_clicked() QMessageBox::information(this, tr("OK"), tr("JVisualVM setup seems to be OK")); } } + +void SettingsDialog::on_mceditPathBtn_clicked() +{ + QString raw_dir = QFileDialog::getOpenFileName(this, tr("MCEdit Path"), + ui->jvisualvmPathEdit->text()); + QString cooked_dir = NormalizePath(raw_dir); + + // do not allow current dir - it's dirty. Do not allow dirs that don't exist + if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists()) + { + ui->mceditPathEdit->setText(cooked_dir); + } +} +void SettingsDialog::on_mceditCheckBtn_clicked() +{ + QString error; + if (!MMC->tools()["mcedit"]->check(ui->mceditPathEdit->text(), &error)) + { + QMessageBox::critical(this, tr("Error"), + tr("Error while checking MCEdit install:\n%1").arg(error)); + } + else + { + QMessageBox::information(this, tr("OK"), tr("MCEdit setup seems to be OK")); + } +} diff --git a/gui/dialogs/SettingsDialog.h b/gui/dialogs/SettingsDialog.h index 60d569f9..d8495fdd 100644 --- a/gui/dialogs/SettingsDialog.h +++ b/gui/dialogs/SettingsDialog.h @@ -79,6 +79,8 @@ slots: void on_jprofilerCheckBtn_clicked(); void on_jvisualvmPathBtn_clicked(); void on_jvisualvmCheckBtn_clicked(); + void on_mceditPathBtn_clicked(); + void on_mceditCheckBtn_clicked(); /*! * Updates the list of update channels in the combo box. diff --git a/gui/dialogs/SettingsDialog.ui b/gui/dialogs/SettingsDialog.ui index acf360a3..fbfa7aed 100644 --- a/gui/dialogs/SettingsDialog.ui +++ b/gui/dialogs/SettingsDialog.ui @@ -863,9 +863,9 @@ - + - Profiling + External Tools @@ -928,6 +928,36 @@ + + + + MCEdit + + + + + + + + + + + ... + + + + + + + + + Check + + + + + + diff --git a/logic/BaseExternalTool.cpp b/logic/BaseExternalTool.cpp new file mode 100644 index 00000000..6dffb4d6 --- /dev/null +++ b/logic/BaseExternalTool.cpp @@ -0,0 +1,47 @@ +#include "BaseExternalTool.h" + +#include +#ifdef Q_OS_WIN +#include +#endif + +BaseExternalTool::BaseExternalTool(BaseInstance *instance, QObject *parent) + : QObject(parent), m_instance(instance) +{ +} + +BaseExternalTool::~BaseExternalTool() +{ +} + +qint64 BaseExternalTool::pid(QProcess *process) +{ +#ifdef Q_OS_WIN + struct _PROCESS_INFORMATION *procinfo = process->pid(); + return procinfo->dwProcessId; +#else + return process->pid(); +#endif +} + + +BaseDetachedTool::BaseDetachedTool(BaseInstance *instance, QObject *parent) + : BaseExternalTool(instance, parent) +{ + +} + +void BaseDetachedTool::run() +{ + runImpl(); +} + + +BaseExternalToolFactory::~BaseExternalToolFactory() +{ +} + +BaseDetachedTool *BaseDetachedToolFactory::createDetachedTool(BaseInstance *instance, QObject *parent) +{ + return qobject_cast(createTool(instance, parent)); +} diff --git a/logic/BaseExternalTool.h b/logic/BaseExternalTool.h new file mode 100644 index 00000000..184b1f80 --- /dev/null +++ b/logic/BaseExternalTool.h @@ -0,0 +1,56 @@ +#pragma once + +#include + +class BaseInstance; +class SettingsObject; +class MinecraftProcess; +class QProcess; + +class BaseExternalTool : public QObject +{ + Q_OBJECT +public: + explicit BaseExternalTool(BaseInstance *instance, QObject *parent = 0); + virtual ~BaseExternalTool(); + +protected: + BaseInstance *m_instance; + + qint64 pid(QProcess *process); +}; + +class BaseDetachedTool : public BaseExternalTool +{ + Q_OBJECT +public: + explicit BaseDetachedTool(BaseInstance *instance, QObject *parent = 0); + +public +slots: + void run(); + +protected: + virtual void runImpl() = 0; +}; + +class BaseExternalToolFactory +{ +public: + virtual ~BaseExternalToolFactory(); + + virtual QString name() const = 0; + + virtual void registerSettings(SettingsObject *settings) = 0; + + virtual BaseExternalTool *createTool(BaseInstance *instance, QObject *parent = 0) = 0; + + virtual bool check(QString *error) = 0; + virtual bool check(const QString &path, QString *error) = 0; +}; + +class BaseDetachedToolFactory : public BaseExternalToolFactory +{ +public: + virtual BaseDetachedTool *createDetachedTool(BaseInstance *instance, QObject *parent = 0); +}; diff --git a/logic/MCEditTool.cpp b/logic/MCEditTool.cpp new file mode 100644 index 00000000..93ffb7a5 --- /dev/null +++ b/logic/MCEditTool.cpp @@ -0,0 +1,62 @@ +#include "MCEditTool.h" + +#include +#include +#include + +#include "settingsobject.h" +#include "logic/BaseInstance.h" +#include "MultiMC.h" + +MCEditTool::MCEditTool(BaseInstance *instance, QObject *parent) + : BaseDetachedTool(instance, parent) +{ +} + +void MCEditTool::runImpl() +{ + const QString mceditPath = MMC->settings()->get("MCEditPath").toString(); + const QString save = QFileDialog::getExistingDirectory( + MMC->activeWindow(), tr("MCEdit"), + QDir(m_instance->minecraftRoot()).absoluteFilePath("saves")); + if (save.isEmpty()) + { + return; + } + const QString program = + QDir(mceditPath).absoluteFilePath("mcedit.py"); + QProcess::startDetached(program, QStringList() << save, mceditPath); +} + +void MCEditFactory::registerSettings(SettingsObject *settings) +{ + settings->registerSetting("MCEditPath"); +} +BaseExternalTool *MCEditFactory::createTool(BaseInstance *instance, QObject *parent) +{ + return new MCEditTool(instance, parent); +} +bool MCEditFactory::check(QString *error) +{ + return check(MMC->settings()->get("MCEditPath").toString(), error); +} +bool MCEditFactory::check(const QString &path, QString *error) +{ + if (path.isEmpty()) + { + *error = QObject::tr("Path is empty"); + return false; + } + const QDir dir(path); + if (!dir.exists()) + { + *error = QObject::tr("Path does not exist"); + return false; + } + if (!dir.exists("mcedit.py")) + { + *error = QObject::tr("Path does not contain mcedit.py"); + return false; + } + return true; +} diff --git a/logic/MCEditTool.h b/logic/MCEditTool.h new file mode 100644 index 00000000..b0ed1ad4 --- /dev/null +++ b/logic/MCEditTool.h @@ -0,0 +1,23 @@ +#pragma once + +#include "BaseExternalTool.h" + +class MCEditTool : public BaseDetachedTool +{ + Q_OBJECT +public: + explicit MCEditTool(BaseInstance *instance, QObject *parent = 0); + +protected: + void runImpl() override; +}; + +class MCEditFactory : public BaseDetachedToolFactory +{ +public: + QString name() const override { return "MCEdit"; } + void registerSettings(SettingsObject *settings) override; + BaseExternalTool *createTool(BaseInstance *instance, QObject *parent = 0) override; + bool check(QString *error) override; + bool check(const QString &path, QString *error) override; +}; diff --git a/logic/profiler/BaseProfiler.cpp b/logic/profiler/BaseProfiler.cpp index b58e88be..9aaca793 100644 --- a/logic/profiler/BaseProfiler.cpp +++ b/logic/profiler/BaseProfiler.cpp @@ -1,16 +1,9 @@ #include "BaseProfiler.h" #include -#ifdef Q_OS_WIN -#include -#endif BaseProfiler::BaseProfiler(BaseInstance *instance, QObject *parent) - : QObject(parent), m_instance(instance) -{ -} - -BaseProfiler::~BaseProfiler() + : BaseExternalTool(instance, parent) { } @@ -36,16 +29,7 @@ void BaseProfiler::abortProfilingImpl() emit abortLaunch(tr("Profiler aborted")); } -qint64 BaseProfiler::pid(QProcess *process) -{ -#ifdef Q_OS_WIN - struct _PROCESS_INFORMATION *procinfo = process->pid(); - return procinfo->dwProcessId; -#else - return process->pid(); -#endif -} - -BaseProfilerFactory::~BaseProfilerFactory() +BaseProfiler *BaseProfilerFactory::createProfiler(BaseInstance *instance, QObject *parent) { + return qobject_cast(createTool(instance, parent)); } diff --git a/logic/profiler/BaseProfiler.h b/logic/profiler/BaseProfiler.h index e0d1d5f6..082cb65a 100644 --- a/logic/profiler/BaseProfiler.h +++ b/logic/profiler/BaseProfiler.h @@ -1,18 +1,17 @@ #pragma once -#include +#include "logic/BaseExternalTool.h" class BaseInstance; class SettingsObject; class MinecraftProcess; class QProcess; -class BaseProfiler : public QObject +class BaseProfiler : public BaseExternalTool { Q_OBJECT public: explicit BaseProfiler(BaseInstance *instance, QObject *parent = 0); - virtual ~BaseProfiler(); public slots: @@ -20,30 +19,18 @@ slots: void abortProfiling(); protected: - BaseInstance *m_instance; QProcess *m_profilerProcess; virtual void beginProfilingImpl(MinecraftProcess *process) = 0; virtual void abortProfilingImpl(); - qint64 pid(QProcess *process); - signals: void readyToLaunch(const QString &message); void abortLaunch(const QString &message); }; -class BaseProfilerFactory +class BaseProfilerFactory : public BaseExternalToolFactory { public: - virtual ~BaseProfilerFactory(); - - virtual QString name() const = 0; - - virtual void registerSettings(SettingsObject *settings) = 0; - - virtual BaseProfiler *createProfiler(BaseInstance *instance, QObject *parent = 0) = 0; - - virtual bool check(QString *error) = 0; - virtual bool check(const QString &path, QString *error) = 0; + virtual BaseProfiler *createProfiler(BaseInstance *instance, QObject *parent = 0); }; diff --git a/logic/profiler/JProfiler.cpp b/logic/profiler/JProfiler.cpp index 1cd8d128..bb851f0b 100644 --- a/logic/profiler/JProfiler.cpp +++ b/logic/profiler/JProfiler.cpp @@ -46,7 +46,7 @@ void JProfilerFactory::registerSettings(SettingsObject *settings) settings->registerSetting("JProfilerPort", 42042); } -BaseProfiler *JProfilerFactory::createProfiler(BaseInstance *instance, QObject *parent) +BaseExternalTool *JProfilerFactory::createTool(BaseInstance *instance, QObject *parent) { return new JProfiler(instance, parent); } diff --git a/logic/profiler/JProfiler.h b/logic/profiler/JProfiler.h index 8a5bc561..88a02462 100644 --- a/logic/profiler/JProfiler.h +++ b/logic/profiler/JProfiler.h @@ -17,7 +17,7 @@ class JProfilerFactory : public BaseProfilerFactory public: QString name() const override { return "JProfiler"; } void registerSettings(SettingsObject *settings) override; - BaseProfiler *createProfiler(BaseInstance *instance, QObject *parent = 0) override; + BaseExternalTool *createTool(BaseInstance *instance, QObject *parent = 0) override; bool check(QString *error) override; bool check(const QString &path, QString *error) override; }; diff --git a/logic/profiler/JVisualVM.cpp b/logic/profiler/JVisualVM.cpp index c4bc851b..7b79b2e8 100644 --- a/logic/profiler/JVisualVM.cpp +++ b/logic/profiler/JVisualVM.cpp @@ -42,7 +42,7 @@ void JVisualVMFactory::registerSettings(SettingsObject *settings) settings->registerSetting("JVisualVMPath"); } -BaseProfiler *JVisualVMFactory::createProfiler(BaseInstance *instance, QObject *parent) +BaseExternalTool *JVisualVMFactory::createTool(BaseInstance *instance, QObject *parent) { return new JVisualVM(instance, parent); } diff --git a/logic/profiler/JVisualVM.h b/logic/profiler/JVisualVM.h index 154180b4..af94fe55 100644 --- a/logic/profiler/JVisualVM.h +++ b/logic/profiler/JVisualVM.h @@ -17,7 +17,7 @@ class JVisualVMFactory : public BaseProfilerFactory public: QString name() const override { return "JVisualVM"; } void registerSettings(SettingsObject *settings) override; - BaseProfiler *createProfiler(BaseInstance *instance, QObject *parent = 0) override; + BaseExternalTool *createTool(BaseInstance *instance, QObject *parent = 0) override; bool check(QString *error) override; bool check(const QString &path, QString *error) override; }; -- cgit From 9c87bc6c4b99f0c93f2b18039208dcf9f3fb4d79 Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Sun, 16 Feb 2014 12:52:35 +0100 Subject: Restructure --- CMakeLists.txt | 22 ++++++------ MultiMC.cpp | 6 ++-- gui/MainWindow.cpp | 2 +- gui/dialogs/SettingsDialog.cpp | 2 +- logic/BaseExternalTool.cpp | 77 --------------------------------------- logic/BaseExternalTool.h | 57 ----------------------------- logic/MCEditTool.cpp | 67 ---------------------------------- logic/MCEditTool.h | 23 ------------ logic/profiler/BaseProfiler.cpp | 35 ------------------ logic/profiler/BaseProfiler.h | 36 ------------------- logic/profiler/JProfiler.cpp | 78 ---------------------------------------- logic/profiler/JProfiler.h | 23 ------------ logic/profiler/JVisualVM.cpp | 74 -------------------------------------- logic/profiler/JVisualVM.h | 23 ------------ logic/tools/BaseExternalTool.cpp | 77 +++++++++++++++++++++++++++++++++++++++ logic/tools/BaseExternalTool.h | 57 +++++++++++++++++++++++++++++ logic/tools/BaseProfiler.cpp | 35 ++++++++++++++++++ logic/tools/BaseProfiler.h | 36 +++++++++++++++++++ logic/tools/JProfiler.cpp | 78 ++++++++++++++++++++++++++++++++++++++++ logic/tools/JProfiler.h | 23 ++++++++++++ logic/tools/JVisualVM.cpp | 74 ++++++++++++++++++++++++++++++++++++++ logic/tools/JVisualVM.h | 23 ++++++++++++ logic/tools/MCEditTool.cpp | 67 ++++++++++++++++++++++++++++++++++ logic/tools/MCEditTool.h | 23 ++++++++++++ 24 files changed, 509 insertions(+), 509 deletions(-) delete mode 100644 logic/BaseExternalTool.cpp delete mode 100644 logic/BaseExternalTool.h delete mode 100644 logic/MCEditTool.cpp delete mode 100644 logic/MCEditTool.h delete mode 100644 logic/profiler/BaseProfiler.cpp delete mode 100644 logic/profiler/BaseProfiler.h delete mode 100644 logic/profiler/JProfiler.cpp delete mode 100644 logic/profiler/JProfiler.h delete mode 100644 logic/profiler/JVisualVM.cpp delete mode 100644 logic/profiler/JVisualVM.h create mode 100644 logic/tools/BaseExternalTool.cpp create mode 100644 logic/tools/BaseExternalTool.h create mode 100644 logic/tools/BaseProfiler.cpp create mode 100644 logic/tools/BaseProfiler.h create mode 100644 logic/tools/JProfiler.cpp create mode 100644 logic/tools/JProfiler.h create mode 100644 logic/tools/JVisualVM.cpp create mode 100644 logic/tools/JVisualVM.h create mode 100644 logic/tools/MCEditTool.cpp create mode 100644 logic/tools/MCEditTool.h (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 58d01eb8..43c02efc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -499,17 +499,17 @@ logic/assets/AssetsMigrateTask.cpp logic/assets/AssetsUtils.h logic/assets/AssetsUtils.cpp -# Profiling and tools -logic/BaseExternalTool.h -logic/BaseExternalTool.cpp -logic/MCEditTool.h -logic/MCEditTool.cpp -logic/profiler/BaseProfiler.h -logic/profiler/BaseProfiler.cpp -logic/profiler/JProfiler.h -logic/profiler/JProfiler.cpp -logic/profiler/JVisualVM.h -logic/profiler/JVisualVM.cpp +# Tools +logic/tools/BaseExternalTool.h +logic/tools/BaseExternalTool.cpp +logic/tools/MCEditTool.h +logic/tools/MCEditTool.cpp +logic/tools/BaseProfiler.h +logic/tools/BaseProfiler.cpp +logic/tools/JProfiler.h +logic/tools/JProfiler.cpp +logic/tools/JVisualVM.h +logic/tools/JVisualVM.cpp ) diff --git a/MultiMC.cpp b/MultiMC.cpp index c813c425..294a4926 100644 --- a/MultiMC.cpp +++ b/MultiMC.cpp @@ -31,9 +31,9 @@ #include "logic/updater/UpdateChecker.h" #include "logic/updater/NotificationChecker.h" -#include "logic/profiler/JProfiler.h" -#include "logic/profiler/JVisualVM.h" -#include "logic/MCEditTool.h" +#include "logic/tools/JProfiler.h" +#include "logic/tools/JVisualVM.h" +#include "logic/tools/MCEditTool.h" #include "pathutils.h" #include "cmdutils.h" diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index 16c88201..ebbace52 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -98,7 +98,7 @@ #include #include -#include "logic/profiler/BaseProfiler.h" +#include "logic/tools/BaseProfiler.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { diff --git a/gui/dialogs/SettingsDialog.cpp b/gui/dialogs/SettingsDialog.cpp index d20c0aa7..cd5aba74 100644 --- a/gui/dialogs/SettingsDialog.cpp +++ b/gui/dialogs/SettingsDialog.cpp @@ -29,7 +29,7 @@ #include "logic/updater/UpdateChecker.h" -#include "logic/profiler/BaseProfiler.h" +#include "logic/tools/BaseProfiler.h" #include #include diff --git a/logic/BaseExternalTool.cpp b/logic/BaseExternalTool.cpp deleted file mode 100644 index 081c3ef0..00000000 --- a/logic/BaseExternalTool.cpp +++ /dev/null @@ -1,77 +0,0 @@ -#include "BaseExternalTool.h" - -#include -#include -#include - -#ifdef Q_OS_WIN -#include -#endif - -#include "BaseInstance.h" -#include "MultiMC.h" - -BaseExternalTool::BaseExternalTool(BaseInstance *instance, QObject *parent) - : QObject(parent), m_instance(instance) -{ -} - -BaseExternalTool::~BaseExternalTool() -{ -} - -qint64 BaseExternalTool::pid(QProcess *process) -{ -#ifdef Q_OS_WIN - struct _PROCESS_INFORMATION *procinfo = process->pid(); - return procinfo->dwProcessId; -#else - return process->pid(); -#endif -} - -QString BaseExternalTool::getSave() const -{ - QDir saves(m_instance->minecraftRoot() + "/saves"); - QStringList worlds = saves.entryList(QDir::Dirs | QDir::NoDotAndDotDot); - QMutableListIterator it(worlds); - while (it.hasNext()) - { - it.next(); - if (!QDir(saves.absoluteFilePath(it.value())).exists("level.dat")) - { - it.remove(); - } - } - bool ok = true; - const QString save = QInputDialog::getItem( - MMC->activeWindow(), tr("MCEdit"), tr("Choose which world to open:"), - worlds, 0, false, &ok); - if (ok) - { - return saves.absoluteFilePath(save); - } - return QString(); -} - - -BaseDetachedTool::BaseDetachedTool(BaseInstance *instance, QObject *parent) - : BaseExternalTool(instance, parent) -{ - -} - -void BaseDetachedTool::run() -{ - runImpl(); -} - - -BaseExternalToolFactory::~BaseExternalToolFactory() -{ -} - -BaseDetachedTool *BaseDetachedToolFactory::createDetachedTool(BaseInstance *instance, QObject *parent) -{ - return qobject_cast(createTool(instance, parent)); -} diff --git a/logic/BaseExternalTool.h b/logic/BaseExternalTool.h deleted file mode 100644 index e8965bfd..00000000 --- a/logic/BaseExternalTool.h +++ /dev/null @@ -1,57 +0,0 @@ -#pragma once - -#include - -class BaseInstance; -class SettingsObject; -class MinecraftProcess; -class QProcess; - -class BaseExternalTool : public QObject -{ - Q_OBJECT -public: - explicit BaseExternalTool(BaseInstance *instance, QObject *parent = 0); - virtual ~BaseExternalTool(); - -protected: - BaseInstance *m_instance; - - qint64 pid(QProcess *process); - QString getSave() const; -}; - -class BaseDetachedTool : public BaseExternalTool -{ - Q_OBJECT -public: - explicit BaseDetachedTool(BaseInstance *instance, QObject *parent = 0); - -public -slots: - void run(); - -protected: - virtual void runImpl() = 0; -}; - -class BaseExternalToolFactory -{ -public: - virtual ~BaseExternalToolFactory(); - - virtual QString name() const = 0; - - virtual void registerSettings(SettingsObject *settings) = 0; - - virtual BaseExternalTool *createTool(BaseInstance *instance, QObject *parent = 0) = 0; - - virtual bool check(QString *error) = 0; - virtual bool check(const QString &path, QString *error) = 0; -}; - -class BaseDetachedToolFactory : public BaseExternalToolFactory -{ -public: - virtual BaseDetachedTool *createDetachedTool(BaseInstance *instance, QObject *parent = 0); -}; diff --git a/logic/MCEditTool.cpp b/logic/MCEditTool.cpp deleted file mode 100644 index c4edece5..00000000 --- a/logic/MCEditTool.cpp +++ /dev/null @@ -1,67 +0,0 @@ -#include "MCEditTool.h" - -#include -#include - -#include "settingsobject.h" -#include "logic/BaseInstance.h" -#include "MultiMC.h" - -MCEditTool::MCEditTool(BaseInstance *instance, QObject *parent) - : BaseDetachedTool(instance, parent) -{ -} - -void MCEditTool::runImpl() -{ - const QString mceditPath = MMC->settings()->get("MCEditPath").toString(); - const QString save = getSave(); - if (save.isNull()) - { - return; - } - QDir mceditDir(mceditPath); - QString program; - if (mceditDir.exists("mcedit.py")) - { - program = mceditDir.absoluteFilePath("mcedit.py"); - } - else if (mceditDir.exists("mcedit.exe")) - { - program = mceditDir.absoluteFilePath("mcedit.exe"); - } - QProcess::startDetached(program, QStringList() << save, mceditPath); -} - -void MCEditFactory::registerSettings(SettingsObject *settings) -{ - settings->registerSetting("MCEditPath"); -} -BaseExternalTool *MCEditFactory::createTool(BaseInstance *instance, QObject *parent) -{ - return new MCEditTool(instance, parent); -} -bool MCEditFactory::check(QString *error) -{ - return check(MMC->settings()->get("MCEditPath").toString(), error); -} -bool MCEditFactory::check(const QString &path, QString *error) -{ - if (path.isEmpty()) - { - *error = QObject::tr("Path is empty"); - return false; - } - const QDir dir(path); - if (!dir.exists()) - { - *error = QObject::tr("Path does not exist"); - return false; - } - if (!dir.exists("mcedit.py") && !dir.exists("mcedit.exe")) - { - *error = QObject::tr("Path does not contain mcedit.py"); - return false; - } - return true; -} diff --git a/logic/MCEditTool.h b/logic/MCEditTool.h deleted file mode 100644 index b0ed1ad4..00000000 --- a/logic/MCEditTool.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "BaseExternalTool.h" - -class MCEditTool : public BaseDetachedTool -{ - Q_OBJECT -public: - explicit MCEditTool(BaseInstance *instance, QObject *parent = 0); - -protected: - void runImpl() override; -}; - -class MCEditFactory : public BaseDetachedToolFactory -{ -public: - QString name() const override { return "MCEdit"; } - void registerSettings(SettingsObject *settings) override; - BaseExternalTool *createTool(BaseInstance *instance, QObject *parent = 0) override; - bool check(QString *error) override; - bool check(const QString &path, QString *error) override; -}; diff --git a/logic/profiler/BaseProfiler.cpp b/logic/profiler/BaseProfiler.cpp deleted file mode 100644 index 9aaca793..00000000 --- a/logic/profiler/BaseProfiler.cpp +++ /dev/null @@ -1,35 +0,0 @@ -#include "BaseProfiler.h" - -#include - -BaseProfiler::BaseProfiler(BaseInstance *instance, QObject *parent) - : BaseExternalTool(instance, parent) -{ -} - -void BaseProfiler::beginProfiling(MinecraftProcess *process) -{ - beginProfilingImpl(process); -} - -void BaseProfiler::abortProfiling() -{ - abortProfilingImpl(); -} - -void BaseProfiler::abortProfilingImpl() -{ - if (!m_profilerProcess) - { - return; - } - m_profilerProcess->terminate(); - m_profilerProcess->deleteLater(); - m_profilerProcess = 0; - emit abortLaunch(tr("Profiler aborted")); -} - -BaseProfiler *BaseProfilerFactory::createProfiler(BaseInstance *instance, QObject *parent) -{ - return qobject_cast(createTool(instance, parent)); -} diff --git a/logic/profiler/BaseProfiler.h b/logic/profiler/BaseProfiler.h deleted file mode 100644 index 082cb65a..00000000 --- a/logic/profiler/BaseProfiler.h +++ /dev/null @@ -1,36 +0,0 @@ -#pragma once - -#include "logic/BaseExternalTool.h" - -class BaseInstance; -class SettingsObject; -class MinecraftProcess; -class QProcess; - -class BaseProfiler : public BaseExternalTool -{ - Q_OBJECT -public: - explicit BaseProfiler(BaseInstance *instance, QObject *parent = 0); - -public -slots: - void beginProfiling(MinecraftProcess *process); - void abortProfiling(); - -protected: - QProcess *m_profilerProcess; - - virtual void beginProfilingImpl(MinecraftProcess *process) = 0; - virtual void abortProfilingImpl(); - -signals: - void readyToLaunch(const QString &message); - void abortLaunch(const QString &message); -}; - -class BaseProfilerFactory : public BaseExternalToolFactory -{ -public: - virtual BaseProfiler *createProfiler(BaseInstance *instance, QObject *parent = 0); -}; diff --git a/logic/profiler/JProfiler.cpp b/logic/profiler/JProfiler.cpp deleted file mode 100644 index bb851f0b..00000000 --- a/logic/profiler/JProfiler.cpp +++ /dev/null @@ -1,78 +0,0 @@ -#include "JProfiler.h" - -#include -#include - -#include "settingsobject.h" -#include "logic/MinecraftProcess.h" -#include "logic/BaseInstance.h" -#include "MultiMC.h" - -JProfiler::JProfiler(BaseInstance *instance, QObject *parent) : BaseProfiler(instance, parent) -{ -} - -void JProfiler::beginProfilingImpl(MinecraftProcess *process) -{ - int port = MMC->settings()->get("JProfilerPort").toInt(); - QProcess *profiler = new QProcess(this); - profiler->setArguments(QStringList() << "-d" << QString::number(pid(process)) << "--gui" - << "-p" << QString::number(port)); - profiler->setProgram(QDir(MMC->settings()->get("JProfilerPath").toString()) - .absoluteFilePath("bin/jpenable")); - connect(profiler, &QProcess::started, [this, port]() - { emit readyToLaunch(tr("Listening on port: %1").arg(port)); }); - connect(profiler, - static_cast(&QProcess::finished), - [this](int exit, QProcess::ExitStatus status) - { - if (status == QProcess::CrashExit) - { - emit abortLaunch(tr("Profiler aborted")); - } - if (m_profilerProcess) - { - m_profilerProcess->deleteLater(); - m_profilerProcess = 0; - } - }); - profiler->start(); - m_profilerProcess = profiler; -} - -void JProfilerFactory::registerSettings(SettingsObject *settings) -{ - settings->registerSetting("JProfilerPath"); - settings->registerSetting("JProfilerPort", 42042); -} - -BaseExternalTool *JProfilerFactory::createTool(BaseInstance *instance, QObject *parent) -{ - return new JProfiler(instance, parent); -} - -bool JProfilerFactory::check(QString *error) -{ - return check(MMC->settings()->get("JProfilerPath").toString(), error); -} - -bool JProfilerFactory::check(const QString &path, QString *error) -{ - if (path.isEmpty()) - { - *error = QObject::tr("Empty path"); - return false; - } - QDir dir(path); - if (!dir.exists()) - { - *error = QObject::tr("Path does not exist"); - return false; - } - if (!dir.exists("bin") || !dir.exists("bin/jprofiler") || !dir.exists("bin/agent.jar")) - { - *error = QObject::tr("Invalid JProfiler install"); - return false; - } - return true; -} diff --git a/logic/profiler/JProfiler.h b/logic/profiler/JProfiler.h deleted file mode 100644 index 88a02462..00000000 --- a/logic/profiler/JProfiler.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "BaseProfiler.h" - -class JProfiler : public BaseProfiler -{ - Q_OBJECT -public: - JProfiler(BaseInstance *instance, QObject *parent = 0); - -protected: - void beginProfilingImpl(MinecraftProcess *process); -}; - -class JProfilerFactory : public BaseProfilerFactory -{ -public: - QString name() const override { return "JProfiler"; } - void registerSettings(SettingsObject *settings) override; - BaseExternalTool *createTool(BaseInstance *instance, QObject *parent = 0) override; - bool check(QString *error) override; - bool check(const QString &path, QString *error) override; -}; diff --git a/logic/profiler/JVisualVM.cpp b/logic/profiler/JVisualVM.cpp deleted file mode 100644 index 02938028..00000000 --- a/logic/profiler/JVisualVM.cpp +++ /dev/null @@ -1,74 +0,0 @@ -#include "JVisualVM.h" - -#include -#include - -#include "settingsobject.h" -#include "logic/MinecraftProcess.h" -#include "logic/BaseInstance.h" -#include "MultiMC.h" - -JVisualVM::JVisualVM(BaseInstance *instance, QObject *parent) : BaseProfiler(instance, parent) -{ -} - -void JVisualVM::beginProfilingImpl(MinecraftProcess *process) -{ - QProcess *profiler = new QProcess(this); - profiler->setArguments(QStringList() << "--openpid" << QString::number(pid(process))); - profiler->setProgram(MMC->settings()->get("JVisualVMPath").toString()); - connect(profiler, &QProcess::started, [this]() - { emit readyToLaunch(tr("JVisualVM started")); }); - connect(profiler, - static_cast(&QProcess::finished), - [this](int exit, QProcess::ExitStatus status) - { - if (exit != 0 || status == QProcess::CrashExit) - { - emit abortLaunch(tr("Profiler aborted")); - } - if (m_profilerProcess) - { - m_profilerProcess->deleteLater(); - m_profilerProcess = 0; - } - }); - profiler->start(); - m_profilerProcess = profiler; -} - -void JVisualVMFactory::registerSettings(SettingsObject *settings) -{ - QString defaultValue = QStandardPaths::findExecutable("jvisualvm"); - if (defaultValue.isNull()) - { - defaultValue = QStandardPaths::findExecutable("visualvm"); - } - settings->registerSetting("JVisualVMPath", defaultValue); -} - -BaseExternalTool *JVisualVMFactory::createTool(BaseInstance *instance, QObject *parent) -{ - return new JVisualVM(instance, parent); -} - -bool JVisualVMFactory::check(QString *error) -{ - return check(MMC->settings()->get("JVisualVMPath").toString(), error); -} - -bool JVisualVMFactory::check(const QString &path, QString *error) -{ - if (path.isEmpty()) - { - *error = QObject::tr("Empty path"); - return false; - } - QString resolved = QStandardPaths::findExecutable(path); - if (resolved.isEmpty() && !QDir::isAbsolutePath(path)) - { - *error = QObject::tr("Invalid path to JVisualVM"); - return false; - } - return true; -} diff --git a/logic/profiler/JVisualVM.h b/logic/profiler/JVisualVM.h deleted file mode 100644 index af94fe55..00000000 --- a/logic/profiler/JVisualVM.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "BaseProfiler.h" - -class JVisualVM : public BaseProfiler -{ - Q_OBJECT -public: - JVisualVM(BaseInstance *instance, QObject *parent = 0); - -protected: - void beginProfilingImpl(MinecraftProcess *process); -}; - -class JVisualVMFactory : public BaseProfilerFactory -{ -public: - QString name() const override { return "JVisualVM"; } - void registerSettings(SettingsObject *settings) override; - BaseExternalTool *createTool(BaseInstance *instance, QObject *parent = 0) override; - bool check(QString *error) override; - bool check(const QString &path, QString *error) override; -}; diff --git a/logic/tools/BaseExternalTool.cpp b/logic/tools/BaseExternalTool.cpp new file mode 100644 index 00000000..69cddd00 --- /dev/null +++ b/logic/tools/BaseExternalTool.cpp @@ -0,0 +1,77 @@ +#include "BaseExternalTool.h" + +#include +#include +#include + +#ifdef Q_OS_WIN +#include +#endif + +#include "logic/BaseInstance.h" +#include "MultiMC.h" + +BaseExternalTool::BaseExternalTool(BaseInstance *instance, QObject *parent) + : QObject(parent), m_instance(instance) +{ +} + +BaseExternalTool::~BaseExternalTool() +{ +} + +qint64 BaseExternalTool::pid(QProcess *process) +{ +#ifdef Q_OS_WIN + struct _PROCESS_INFORMATION *procinfo = process->pid(); + return procinfo->dwProcessId; +#else + return process->pid(); +#endif +} + +QString BaseExternalTool::getSave() const +{ + QDir saves(m_instance->minecraftRoot() + "/saves"); + QStringList worlds = saves.entryList(QDir::Dirs | QDir::NoDotAndDotDot); + QMutableListIterator it(worlds); + while (it.hasNext()) + { + it.next(); + if (!QDir(saves.absoluteFilePath(it.value())).exists("level.dat")) + { + it.remove(); + } + } + bool ok = true; + const QString save = QInputDialog::getItem( + MMC->activeWindow(), tr("MCEdit"), tr("Choose which world to open:"), + worlds, 0, false, &ok); + if (ok) + { + return saves.absoluteFilePath(save); + } + return QString(); +} + + +BaseDetachedTool::BaseDetachedTool(BaseInstance *instance, QObject *parent) + : BaseExternalTool(instance, parent) +{ + +} + +void BaseDetachedTool::run() +{ + runImpl(); +} + + +BaseExternalToolFactory::~BaseExternalToolFactory() +{ +} + +BaseDetachedTool *BaseDetachedToolFactory::createDetachedTool(BaseInstance *instance, QObject *parent) +{ + return qobject_cast(createTool(instance, parent)); +} diff --git a/logic/tools/BaseExternalTool.h b/logic/tools/BaseExternalTool.h new file mode 100644 index 00000000..e8965bfd --- /dev/null +++ b/logic/tools/BaseExternalTool.h @@ -0,0 +1,57 @@ +#pragma once + +#include + +class BaseInstance; +class SettingsObject; +class MinecraftProcess; +class QProcess; + +class BaseExternalTool : public QObject +{ + Q_OBJECT +public: + explicit BaseExternalTool(BaseInstance *instance, QObject *parent = 0); + virtual ~BaseExternalTool(); + +protected: + BaseInstance *m_instance; + + qint64 pid(QProcess *process); + QString getSave() const; +}; + +class BaseDetachedTool : public BaseExternalTool +{ + Q_OBJECT +public: + explicit BaseDetachedTool(BaseInstance *instance, QObject *parent = 0); + +public +slots: + void run(); + +protected: + virtual void runImpl() = 0; +}; + +class BaseExternalToolFactory +{ +public: + virtual ~BaseExternalToolFactory(); + + virtual QString name() const = 0; + + virtual void registerSettings(SettingsObject *settings) = 0; + + virtual BaseExternalTool *createTool(BaseInstance *instance, QObject *parent = 0) = 0; + + virtual bool check(QString *error) = 0; + virtual bool check(const QString &path, QString *error) = 0; +}; + +class BaseDetachedToolFactory : public BaseExternalToolFactory +{ +public: + virtual BaseDetachedTool *createDetachedTool(BaseInstance *instance, QObject *parent = 0); +}; diff --git a/logic/tools/BaseProfiler.cpp b/logic/tools/BaseProfiler.cpp new file mode 100644 index 00000000..9aaca793 --- /dev/null +++ b/logic/tools/BaseProfiler.cpp @@ -0,0 +1,35 @@ +#include "BaseProfiler.h" + +#include + +BaseProfiler::BaseProfiler(BaseInstance *instance, QObject *parent) + : BaseExternalTool(instance, parent) +{ +} + +void BaseProfiler::beginProfiling(MinecraftProcess *process) +{ + beginProfilingImpl(process); +} + +void BaseProfiler::abortProfiling() +{ + abortProfilingImpl(); +} + +void BaseProfiler::abortProfilingImpl() +{ + if (!m_profilerProcess) + { + return; + } + m_profilerProcess->terminate(); + m_profilerProcess->deleteLater(); + m_profilerProcess = 0; + emit abortLaunch(tr("Profiler aborted")); +} + +BaseProfiler *BaseProfilerFactory::createProfiler(BaseInstance *instance, QObject *parent) +{ + return qobject_cast(createTool(instance, parent)); +} diff --git a/logic/tools/BaseProfiler.h b/logic/tools/BaseProfiler.h new file mode 100644 index 00000000..ec57578e --- /dev/null +++ b/logic/tools/BaseProfiler.h @@ -0,0 +1,36 @@ +#pragma once + +#include "BaseExternalTool.h" + +class BaseInstance; +class SettingsObject; +class MinecraftProcess; +class QProcess; + +class BaseProfiler : public BaseExternalTool +{ + Q_OBJECT +public: + explicit BaseProfiler(BaseInstance *instance, QObject *parent = 0); + +public +slots: + void beginProfiling(MinecraftProcess *process); + void abortProfiling(); + +protected: + QProcess *m_profilerProcess; + + virtual void beginProfilingImpl(MinecraftProcess *process) = 0; + virtual void abortProfilingImpl(); + +signals: + void readyToLaunch(const QString &message); + void abortLaunch(const QString &message); +}; + +class BaseProfilerFactory : public BaseExternalToolFactory +{ +public: + virtual BaseProfiler *createProfiler(BaseInstance *instance, QObject *parent = 0); +}; diff --git a/logic/tools/JProfiler.cpp b/logic/tools/JProfiler.cpp new file mode 100644 index 00000000..bb851f0b --- /dev/null +++ b/logic/tools/JProfiler.cpp @@ -0,0 +1,78 @@ +#include "JProfiler.h" + +#include +#include + +#include "settingsobject.h" +#include "logic/MinecraftProcess.h" +#include "logic/BaseInstance.h" +#include "MultiMC.h" + +JProfiler::JProfiler(BaseInstance *instance, QObject *parent) : BaseProfiler(instance, parent) +{ +} + +void JProfiler::beginProfilingImpl(MinecraftProcess *process) +{ + int port = MMC->settings()->get("JProfilerPort").toInt(); + QProcess *profiler = new QProcess(this); + profiler->setArguments(QStringList() << "-d" << QString::number(pid(process)) << "--gui" + << "-p" << QString::number(port)); + profiler->setProgram(QDir(MMC->settings()->get("JProfilerPath").toString()) + .absoluteFilePath("bin/jpenable")); + connect(profiler, &QProcess::started, [this, port]() + { emit readyToLaunch(tr("Listening on port: %1").arg(port)); }); + connect(profiler, + static_cast(&QProcess::finished), + [this](int exit, QProcess::ExitStatus status) + { + if (status == QProcess::CrashExit) + { + emit abortLaunch(tr("Profiler aborted")); + } + if (m_profilerProcess) + { + m_profilerProcess->deleteLater(); + m_profilerProcess = 0; + } + }); + profiler->start(); + m_profilerProcess = profiler; +} + +void JProfilerFactory::registerSettings(SettingsObject *settings) +{ + settings->registerSetting("JProfilerPath"); + settings->registerSetting("JProfilerPort", 42042); +} + +BaseExternalTool *JProfilerFactory::createTool(BaseInstance *instance, QObject *parent) +{ + return new JProfiler(instance, parent); +} + +bool JProfilerFactory::check(QString *error) +{ + return check(MMC->settings()->get("JProfilerPath").toString(), error); +} + +bool JProfilerFactory::check(const QString &path, QString *error) +{ + if (path.isEmpty()) + { + *error = QObject::tr("Empty path"); + return false; + } + QDir dir(path); + if (!dir.exists()) + { + *error = QObject::tr("Path does not exist"); + return false; + } + if (!dir.exists("bin") || !dir.exists("bin/jprofiler") || !dir.exists("bin/agent.jar")) + { + *error = QObject::tr("Invalid JProfiler install"); + return false; + } + return true; +} diff --git a/logic/tools/JProfiler.h b/logic/tools/JProfiler.h new file mode 100644 index 00000000..88a02462 --- /dev/null +++ b/logic/tools/JProfiler.h @@ -0,0 +1,23 @@ +#pragma once + +#include "BaseProfiler.h" + +class JProfiler : public BaseProfiler +{ + Q_OBJECT +public: + JProfiler(BaseInstance *instance, QObject *parent = 0); + +protected: + void beginProfilingImpl(MinecraftProcess *process); +}; + +class JProfilerFactory : public BaseProfilerFactory +{ +public: + QString name() const override { return "JProfiler"; } + void registerSettings(SettingsObject *settings) override; + BaseExternalTool *createTool(BaseInstance *instance, QObject *parent = 0) override; + bool check(QString *error) override; + bool check(const QString &path, QString *error) override; +}; diff --git a/logic/tools/JVisualVM.cpp b/logic/tools/JVisualVM.cpp new file mode 100644 index 00000000..02938028 --- /dev/null +++ b/logic/tools/JVisualVM.cpp @@ -0,0 +1,74 @@ +#include "JVisualVM.h" + +#include +#include + +#include "settingsobject.h" +#include "logic/MinecraftProcess.h" +#include "logic/BaseInstance.h" +#include "MultiMC.h" + +JVisualVM::JVisualVM(BaseInstance *instance, QObject *parent) : BaseProfiler(instance, parent) +{ +} + +void JVisualVM::beginProfilingImpl(MinecraftProcess *process) +{ + QProcess *profiler = new QProcess(this); + profiler->setArguments(QStringList() << "--openpid" << QString::number(pid(process))); + profiler->setProgram(MMC->settings()->get("JVisualVMPath").toString()); + connect(profiler, &QProcess::started, [this]() + { emit readyToLaunch(tr("JVisualVM started")); }); + connect(profiler, + static_cast(&QProcess::finished), + [this](int exit, QProcess::ExitStatus status) + { + if (exit != 0 || status == QProcess::CrashExit) + { + emit abortLaunch(tr("Profiler aborted")); + } + if (m_profilerProcess) + { + m_profilerProcess->deleteLater(); + m_profilerProcess = 0; + } + }); + profiler->start(); + m_profilerProcess = profiler; +} + +void JVisualVMFactory::registerSettings(SettingsObject *settings) +{ + QString defaultValue = QStandardPaths::findExecutable("jvisualvm"); + if (defaultValue.isNull()) + { + defaultValue = QStandardPaths::findExecutable("visualvm"); + } + settings->registerSetting("JVisualVMPath", defaultValue); +} + +BaseExternalTool *JVisualVMFactory::createTool(BaseInstance *instance, QObject *parent) +{ + return new JVisualVM(instance, parent); +} + +bool JVisualVMFactory::check(QString *error) +{ + return check(MMC->settings()->get("JVisualVMPath").toString(), error); +} + +bool JVisualVMFactory::check(const QString &path, QString *error) +{ + if (path.isEmpty()) + { + *error = QObject::tr("Empty path"); + return false; + } + QString resolved = QStandardPaths::findExecutable(path); + if (resolved.isEmpty() && !QDir::isAbsolutePath(path)) + { + *error = QObject::tr("Invalid path to JVisualVM"); + return false; + } + return true; +} diff --git a/logic/tools/JVisualVM.h b/logic/tools/JVisualVM.h new file mode 100644 index 00000000..af94fe55 --- /dev/null +++ b/logic/tools/JVisualVM.h @@ -0,0 +1,23 @@ +#pragma once + +#include "BaseProfiler.h" + +class JVisualVM : public BaseProfiler +{ + Q_OBJECT +public: + JVisualVM(BaseInstance *instance, QObject *parent = 0); + +protected: + void beginProfilingImpl(MinecraftProcess *process); +}; + +class JVisualVMFactory : public BaseProfilerFactory +{ +public: + QString name() const override { return "JVisualVM"; } + void registerSettings(SettingsObject *settings) override; + BaseExternalTool *createTool(BaseInstance *instance, QObject *parent = 0) override; + bool check(QString *error) override; + bool check(const QString &path, QString *error) override; +}; diff --git a/logic/tools/MCEditTool.cpp b/logic/tools/MCEditTool.cpp new file mode 100644 index 00000000..c4edece5 --- /dev/null +++ b/logic/tools/MCEditTool.cpp @@ -0,0 +1,67 @@ +#include "MCEditTool.h" + +#include +#include + +#include "settingsobject.h" +#include "logic/BaseInstance.h" +#include "MultiMC.h" + +MCEditTool::MCEditTool(BaseInstance *instance, QObject *parent) + : BaseDetachedTool(instance, parent) +{ +} + +void MCEditTool::runImpl() +{ + const QString mceditPath = MMC->settings()->get("MCEditPath").toString(); + const QString save = getSave(); + if (save.isNull()) + { + return; + } + QDir mceditDir(mceditPath); + QString program; + if (mceditDir.exists("mcedit.py")) + { + program = mceditDir.absoluteFilePath("mcedit.py"); + } + else if (mceditDir.exists("mcedit.exe")) + { + program = mceditDir.absoluteFilePath("mcedit.exe"); + } + QProcess::startDetached(program, QStringList() << save, mceditPath); +} + +void MCEditFactory::registerSettings(SettingsObject *settings) +{ + settings->registerSetting("MCEditPath"); +} +BaseExternalTool *MCEditFactory::createTool(BaseInstance *instance, QObject *parent) +{ + return new MCEditTool(instance, parent); +} +bool MCEditFactory::check(QString *error) +{ + return check(MMC->settings()->get("MCEditPath").toString(), error); +} +bool MCEditFactory::check(const QString &path, QString *error) +{ + if (path.isEmpty()) + { + *error = QObject::tr("Path is empty"); + return false; + } + const QDir dir(path); + if (!dir.exists()) + { + *error = QObject::tr("Path does not exist"); + return false; + } + if (!dir.exists("mcedit.py") && !dir.exists("mcedit.exe")) + { + *error = QObject::tr("Path does not contain mcedit.py"); + return false; + } + return true; +} diff --git a/logic/tools/MCEditTool.h b/logic/tools/MCEditTool.h new file mode 100644 index 00000000..b0ed1ad4 --- /dev/null +++ b/logic/tools/MCEditTool.h @@ -0,0 +1,23 @@ +#pragma once + +#include "BaseExternalTool.h" + +class MCEditTool : public BaseDetachedTool +{ + Q_OBJECT +public: + explicit MCEditTool(BaseInstance *instance, QObject *parent = 0); + +protected: + void runImpl() override; +}; + +class MCEditFactory : public BaseDetachedToolFactory +{ +public: + QString name() const override { return "MCEdit"; } + void registerSettings(SettingsObject *settings) override; + BaseExternalTool *createTool(BaseInstance *instance, QObject *parent = 0) override; + bool check(QString *error) override; + bool check(const QString &path, QString *error) override; +}; -- cgit