From 6bd2605a79bec9267740f223c87d56d2263d98b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Thu, 20 Apr 2017 05:22:04 +0200 Subject: NOISSUE add import from curse zip packs Does not actually grab mods, but resolves them and prints the results in logs. --- api/logic/InstanceImportTask.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'api/logic/InstanceImportTask.h') diff --git a/api/logic/InstanceImportTask.h b/api/logic/InstanceImportTask.h index fe227e07..0bd7ddf8 100644 --- a/api/logic/InstanceImportTask.h +++ b/api/logic/InstanceImportTask.h @@ -7,8 +7,13 @@ #include #include #include "settings/SettingsObject.h" +#include "QObjectPtr.h" class BaseInstanceProvider; +namespace Curse +{ + class FileResolvingTask; +} class MULTIMC_LOGIC_EXPORT InstanceImportTask : public Task { @@ -23,6 +28,8 @@ protected: private: void extractAndTweak(); + void processMultiMC(const QFileInfo &config); + void processCurse(const QFileInfo &manifest); private slots: void downloadSucceeded(); @@ -30,14 +37,18 @@ private slots: void downloadProgressChanged(qint64 current, qint64 total); void extractFinished(); void extractAborted(); + void curseResolvingSucceeded(); + void curseResolvingFailed(QString reason); private: /* data */ SettingsObjectPtr m_globalSettings; NetJobPtr m_filesNetJob; + shared_qobject_ptr m_curseResolver; QUrl m_sourceUrl; BaseInstanceProvider * m_target; QString m_archivePath; bool m_downloadRequired = false; + QString m_packRoot; QString m_instName; QString m_instIcon; QString m_instGroup; -- cgit v1.2.3