From b8ca36372be11b9ddddb3daa3d32583d286f19e2 Mon Sep 17 00:00:00 2001 From: Janrupf Date: Sat, 3 Mar 2018 21:22:00 +0100 Subject: GH-2124 First complete implementation, installing is working now! GH-2172 Added sorting --- api/logic/modplatform/FtbPackInstallTask.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'api/logic/modplatform/FtbPackInstallTask.h') diff --git a/api/logic/modplatform/FtbPackInstallTask.h b/api/logic/modplatform/FtbPackInstallTask.h index 23ef0811..cf477ae2 100644 --- a/api/logic/modplatform/FtbPackInstallTask.h +++ b/api/logic/modplatform/FtbPackInstallTask.h @@ -5,14 +5,18 @@ #include "net/NetJob.h" #include "quazip.h" #include "quazipdir.h" +#include "meta/Index.h" +#include "meta/Version.h" +#include "meta/VersionList.h" class MULTIMC_LOGIC_EXPORT FtbPackInstallTask : public Task { Q_OBJECT public: - explicit FtbPackInstallTask(FtbPackDownloader *downloader, SettingsObjectPtr settings, const QString & stagingPath, const QString &instName, + explicit FtbPackInstallTask(FtbPackDownloader *downloader, SettingsObjectPtr settings, const QString &stagingPath, const QString &instName, const QString &instIcon, const QString &instGroup); + bool abort() override; protected: //! Entry point for tasks. @@ -25,7 +29,8 @@ private: /* data */ QString m_instIcon; QString m_instGroup; NetJobPtr m_netJobPtr; - FtbPackDownloader *m_downloader = nullptr; + + FtbPackDownloader *m_downloader; std::unique_ptr m_packZip; QFuture m_extractFuture; @@ -35,6 +40,10 @@ private: /* data */ void unzip(QString archivePath); void install(); + bool moveRecursively(QString source, QString dest); + + bool abortable = false; + private slots: void onDownloadSucceeded(QString archivePath); void onDownloadFailed(QString reason); @@ -42,4 +51,5 @@ private slots: void onUnzipFinished(); void onUnzipCanceled(); + }; -- cgit v1.2.3