Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news

Conflicts:
	CMakeLists.txt
	gui/MainWindow.h

4 files changed, 175 insertions, 0 deletions

diff --git a/logic/tasks/SequentialTask.cpp b/logic/tasks/SequentialTask.cpp
new file mode 100644
index 00000000..63025eee
--- /dev/null
+++ b/logic/tasks/SequentialTask.cpp
@@ -0,0 +1,77 @@
+#include "SequentialTask.h"
+
+SequentialTask::SequentialTask(QObject *parent) :
+	Task(parent), m_currentIndex(-1)
+{
+
+}
+
+QString SequentialTask::getStatus() const
+{
+	if (m_queue.isEmpty() || m_currentIndex >= m_queue.size())
+	{
+		return QString();
+	}
+	return m_queue.at(m_currentIndex)->getStatus();
+}
+
+void SequentialTask::getProgress(qint64 &current, qint64 &total)
+{
+	current = 0;
+	total = 0;
+	for (int i = 0; i < m_queue.size(); ++i)
+	{
+		qint64 subCurrent, subTotal;
+		m_queue.at(i)->getProgress(subCurrent, subTotal);
+		current += subCurrent;
+		total += subTotal;
+	}
+}
+
+void SequentialTask::addTask(std::shared_ptr<Task> task)
+{
+	m_queue.append(task);
+}
+
+void SequentialTask::executeTask()
+{
+	m_currentIndex = -1;
+	startNext();
+}
+
+void SequentialTask::startNext()
+{
+	if (m_currentIndex != -1)
+	{
+		std::shared_ptr<Task> previous = m_queue[m_currentIndex];
+		disconnect(previous.get(), 0, this, 0);
+	}
+	m_currentIndex++;
+	if (m_queue.isEmpty() || m_currentIndex >= m_queue.size())
+	{
+		emitSucceeded();
+		return;
+	}
+	std::shared_ptr<Task> next = m_queue[m_currentIndex];
+	connect(next.get(), SIGNAL(failed(QString)), this, SLOT(subTaskFailed(QString)));
+	connect(next.get(), SIGNAL(status(QString)), this, SLOT(subTaskStatus(QString)));
+	connect(next.get(), SIGNAL(progress(qint64,qint64)), this, SLOT(subTaskProgress()));
+	connect(next.get(), SIGNAL(succeeded()), this, SLOT(startNext()));
+	next->start();
+	emit status(getStatus());
+}
+
+void SequentialTask::subTaskFailed(const QString &msg)
+{
+	emitFailed(msg);
+}
+void SequentialTask::subTaskStatus(const QString &msg)
+{
+	setStatus(msg);
+}
+void SequentialTask::subTaskProgress()
+{
+	qint64 current, total;
+	getProgress(current, total);
+	setProgress(100 * current / total);
+}
diff --git a/logic/tasks/SequentialTask.h b/logic/tasks/SequentialTask.h
new file mode 100644
index 00000000..7f046928
--- /dev/null
+++ b/logic/tasks/SequentialTask.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "Task.h"
+
+#include <QQueue>
+#include <memory>
+
+class SequentialTask : public Task
+{
+	Q_OBJECT
+public:
+	explicit SequentialTask(QObject *parent = 0);
+
+	virtual QString getStatus() const;
+	virtual void getProgress(qint64 &current, qint64 &total);
+
+	void addTask(std::shared_ptr<Task> task);
+
+protected:
+	void executeTask();
+
+private
+slots:
+	void startNext();
+	void subTaskFailed(const QString &msg);
+	void subTaskStatus(const QString &msg);
+	void subTaskProgress();
+
+private:
+	QQueue<std::shared_ptr<Task> > m_queue;
+	int m_currentIndex;
+};
diff --git a/logic/tasks/ThreadTask.cpp b/logic/tasks/ThreadTask.cpp
new file mode 100644
index 00000000..ddd1dee5
--- /dev/null
+++ b/logic/tasks/ThreadTask.cpp
@@ -0,0 +1,41 @@
+#include "ThreadTask.h"
+#include <QtConcurrentRun>
+ThreadTask::ThreadTask(Task * internal, QObject *parent) : Task(parent), m_internal(internal)
+{
+}
+
+void ThreadTask::start()
+{
+	connect(m_internal, SIGNAL(failed(QString)), SLOT(iternal_failed(QString)));
+	connect(m_internal, SIGNAL(progress(qint64,qint64)), SLOT(iternal_progress(qint64,qint64)));
+	connect(m_internal, SIGNAL(started()), SLOT(iternal_started()));
+	connect(m_internal, SIGNAL(status(QString)), SLOT(iternal_status(QString)));
+	connect(m_internal, SIGNAL(succeeded()), SLOT(iternal_succeeded()));
+	m_running = true;
+	QtConcurrent::run(m_internal, &Task::start);
+}
+
+void ThreadTask::iternal_failed(QString reason)
+{
+	emitFailed(reason);
+}
+
+void ThreadTask::iternal_progress(qint64 current, qint64 total)
+{
+	progress(current, total);
+}
+
+void ThreadTask::iternal_started()
+{
+	emit started();
+}
+
+void ThreadTask::iternal_status(QString status)
+{
+	setStatus(status);
+}
+
+void ThreadTask::iternal_succeeded()
+{
+	emitSucceeded();
+}
diff --git a/logic/tasks/ThreadTask.h b/logic/tasks/ThreadTask.h
new file mode 100644
index 00000000..718dbc91
--- /dev/null
+++ b/logic/tasks/ThreadTask.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "Task.h"
+
+class ThreadTask : public Task
+{
+	Q_OBJECT
+public:
+	explicit ThreadTask(Task * internal, QObject * parent = nullptr);
+
+protected:
+	void executeTask() {};
+
+public slots:
+	virtual void start();
+
+private slots:
+	void iternal_started();
+	void iternal_progress(qint64 current, qint64 total);
+	void iternal_succeeded();
+	void iternal_failed(QString reason);
+	void iternal_status(QString status);
+private:
+	Task * m_internal;
+};
\ No newline at end of file