Merge branch 'develop' into feature/sparkle-mac

# Conflicts:
#	.github/workflows/build.yml

7 files changed, 297 insertions, 42 deletions

diff --git a/launcher/tasks/ConcurrentTask.cpp b/launcher/tasks/ConcurrentTask.cpp
new file mode 100644
index 00000000..b88cfb13
--- /dev/null
+++ b/launcher/tasks/ConcurrentTask.cpp
@@ -0,0 +1,144 @@
+#include "ConcurrentTask.h"
+
+#include <QDebug>
+
+ConcurrentTask::ConcurrentTask(QObject* parent, QString task_name, int max_concurrent)
+    : Task(parent), m_name(task_name), m_total_max_size(max_concurrent)
+{}
+
+ConcurrentTask::~ConcurrentTask()
+{
+    for (auto task : m_queue) {
+        if (task)
+            task->deleteLater();
+    }
+}
+
+auto ConcurrentTask::getStepProgress() const -> qint64
+{
+    return m_stepProgress;
+}
+
+auto ConcurrentTask::getStepTotalProgress() const -> qint64
+{
+    return m_stepTotalProgress;
+}
+
+void ConcurrentTask::addTask(Task::Ptr task)
+{
+    if (!isRunning())
+        m_queue.append(task);
+    else
+        qWarning() << "Tried to add a task to a running concurrent task!";
+}
+
+void ConcurrentTask::executeTask()
+{
+    m_total_size = m_queue.size();
+
+    for (int i = 0; i < m_total_max_size; i++)
+        startNext();
+}
+
+bool ConcurrentTask::abort()
+{
+    if (m_doing.isEmpty()) {
+        // Don't call emitAborted() here, we want to bypass the 'is the task running' check
+        emit aborted();
+        emit finished();
+
+        m_aborted = true;
+        return true;
+    }
+
+    m_queue.clear();
+
+    m_aborted = true;
+    for (auto task : m_doing)
+        m_aborted &= task->abort();
+
+    if (m_aborted)
+        emitAborted();
+
+    return m_aborted;
+}
+
+void ConcurrentTask::startNext()
+{
+    if (m_aborted || m_doing.count() > m_total_max_size)
+        return;
+
+    if (m_queue.isEmpty() && m_doing.isEmpty()) {
+        emitSucceeded();
+        return;
+    }
+
+    if (m_queue.isEmpty())
+        return;
+
+    Task::Ptr next = m_queue.dequeue();
+
+    connect(next.get(), &Task::succeeded, this, [this, next] { subTaskSucceeded(next); });
+    connect(next.get(), &Task::failed, this, [this, next](QString msg) { subTaskFailed(next, msg); });
+
+    connect(next.get(), &Task::status, this, &ConcurrentTask::subTaskStatus);
+    connect(next.get(), &Task::stepStatus, this, &ConcurrentTask::subTaskStatus);
+
+    connect(next.get(), &Task::progress, this, &ConcurrentTask::subTaskProgress);
+
+    m_doing.insert(next.get(), next);
+
+    setStepStatus(next->isMultiStep() ? next->getStepStatus() : next->getStatus());
+    updateState();
+
+    next->start();
+}
+
+void ConcurrentTask::subTaskSucceeded(Task::Ptr task)
+{
+    m_done.insert(task.get(), task);
+    m_doing.remove(task.get());
+
+    disconnect(task.get(), 0, this, 0);
+
+    updateState();
+
+    startNext();
+}
+
+void ConcurrentTask::subTaskFailed(Task::Ptr task, const QString& msg)
+{
+    m_done.insert(task.get(), task);
+    m_failed.insert(task.get(), task);
+
+    m_doing.remove(task.get());
+
+    disconnect(task.get(), 0, this, 0);
+
+    updateState();
+
+    startNext();
+}
+
+void ConcurrentTask::subTaskStatus(const QString& msg)
+{
+    setStepStatus(msg);
+}
+
+void ConcurrentTask::subTaskProgress(qint64 current, qint64 total)
+{
+    if (total == 0) {
+        setProgress(0, 100);
+        return;
+    }
+
+    m_stepProgress = current;
+    m_stepTotalProgress = total;
+}
+
+void ConcurrentTask::updateState()
+{
+    setProgress(m_done.count(), m_total_size);
+    setStatus(tr("Executing %1 task(s) (%2 out of %3 are done)")
+                  .arg(QString::number(m_doing.count()), QString::number(m_done.count()), QString::number(m_total_size)));
+}
diff --git a/launcher/tasks/ConcurrentTask.h b/launcher/tasks/ConcurrentTask.h
new file mode 100644
index 00000000..5898899d
--- /dev/null
+++ b/launcher/tasks/ConcurrentTask.h
@@ -0,0 +1,58 @@
+#pragma once
+
+#include <QQueue>
+#include <QSet>
+
+#include "tasks/Task.h"
+
+class ConcurrentTask : public Task {
+    Q_OBJECT
+public:
+    explicit ConcurrentTask(QObject* parent = nullptr, QString task_name = "", int max_concurrent = 6);
+    virtual ~ConcurrentTask();
+
+    inline auto isMultiStep() const -> bool override { return m_queue.size() > 1; };
+    auto getStepProgress() const -> qint64 override;
+    auto getStepTotalProgress() const -> qint64 override;
+
+    inline auto getStepStatus() const -> QString override { return m_step_status; }
+
+    void addTask(Task::Ptr task);
+
+public slots:
+    bool abort() override;
+
+protected
+slots:
+    void executeTask() override;
+
+    virtual void startNext();
+
+    void subTaskSucceeded(Task::Ptr);
+    void subTaskFailed(Task::Ptr, const QString &msg);
+    void subTaskStatus(const QString &msg);
+    void subTaskProgress(qint64 current, qint64 total);
+
+protected:
+    void setStepStatus(QString status) { m_step_status = status; emit stepStatus(status); };
+
+    virtual void updateState();
+
+protected:
+    QString m_name;
+    QString m_step_status;
+
+    QQueue<Task::Ptr> m_queue;
+
+    QHash<Task*, Task::Ptr> m_doing;
+    QHash<Task*, Task::Ptr> m_done;
+    QHash<Task*, Task::Ptr> m_failed;
+
+    int m_total_max_size;
+    int m_total_size;
+
+    qint64 m_stepProgress = 0;
+    qint64 m_stepTotalProgress = 100;
+
+    bool m_aborted = false;
+};
diff --git a/launcher/tasks/SequentialTask.cpp b/launcher/tasks/SequentialTask.cpp
index 1573e476..7f03ad2e 100644
--- a/launcher/tasks/SequentialTask.cpp
+++ b/launcher/tasks/SequentialTask.cpp
@@ -33,11 +33,22 @@ void SequentialTask::executeTask()
 
 bool SequentialTask::abort()
 {
-    bool succeeded = true;
-    for (auto& task : m_queue) {
-        if (!task->abort()) succeeded = false;
+    if(m_currentIndex == -1 || m_currentIndex >= m_queue.size()) {
+        if(m_currentIndex == -1) {
+            // Don't call emitAborted() here, we want to bypass the 'is the task running' check
+            emit aborted();
+            emit finished();
+        }
+        m_queue.clear();
+        return true;
     }
 
+    bool succeeded = m_queue[m_currentIndex]->abort();
+    m_queue.clear();
+
+    if(succeeded)
+        emitAborted();
+
     return succeeded;
 }
 
@@ -53,12 +64,18 @@ void SequentialTask::startNext()
         return;
     }
     Task::Ptr next = m_queue[m_currentIndex];
+
     connect(next.get(), SIGNAL(failed(QString)), this, SLOT(subTaskFailed(QString)));
+    connect(next.get(), SIGNAL(succeeded()), this, SLOT(startNext()));
+
     connect(next.get(), SIGNAL(status(QString)), this, SLOT(subTaskStatus(QString)));
+    connect(next.get(), SIGNAL(stepStatus(QString)), this, SLOT(subTaskStatus(QString)));
+    
     connect(next.get(), SIGNAL(progress(qint64, qint64)), this, SLOT(subTaskProgress(qint64, qint64)));
-    connect(next.get(), SIGNAL(succeeded()), this, SLOT(startNext()));
 
     setStatus(tr("Executing task %1 out of %2").arg(m_currentIndex + 1).arg(m_queue.size()));
+    setStepStatus(next->isMultiStep() ? next->getStepStatus() : next->getStatus());
+
     next->start();
 }
 
@@ -68,7 +85,7 @@ void SequentialTask::subTaskFailed(const QString& msg)
 }
 void SequentialTask::subTaskStatus(const QString& msg)
 {
-    setStepStatus(m_queue[m_currentIndex]->getStatus());
+    setStepStatus(msg);
 }
 void SequentialTask::subTaskProgress(qint64 current, qint64 total)
 {
@@ -76,7 +93,7 @@ void SequentialTask::subTaskProgress(qint64 current, qint64 total)
         setProgress(0, 100);
         return;
     }
-    setProgress(m_currentIndex, m_queue.count());
+    setProgress(m_currentIndex + 1, m_queue.count());
 
     m_stepProgress = current;
     m_stepTotalProgress = total;
diff --git a/launcher/tasks/SequentialTask.h b/launcher/tasks/SequentialTask.h
index 5b3c0111..e10cb6f7 100644
--- a/launcher/tasks/SequentialTask.h
+++ b/launcher/tasks/SequentialTask.h
@@ -32,13 +32,10 @@ slots:
     void subTaskStatus(const QString &msg);
     void subTaskProgress(qint64 current, qint64 total);
 
-signals:
-    void stepStatus(QString status);
+protected:
+    void setStepStatus(QString status) { m_step_status = status; emit stepStatus(status); };
 
-private:
-    void setStepStatus(QString status) { m_step_status = status; };
-
-private:
+protected:
     QString m_name;
     QString m_step_status;
 
diff --git a/launcher/tasks/Task.cpp b/launcher/tasks/Task.cpp
index 57307b43..bb71b98c 100644
--- a/launcher/tasks/Task.cpp
+++ b/launcher/tasks/Task.cpp
@@ -1,16 +1,36 @@
-/* Copyright 2013-2021 MultiMC Contributors
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
  */
 
 #include "Task.h"
@@ -99,7 +119,7 @@ void Task::emitAborted()
     m_state = State::AbortedByUser;
     m_failReason = "Aborted.";
     qDebug() << "Task" << describe() << "aborted.";
-    emit failed(m_failReason);
+    emit aborted();
     emit finished();
 }
 
diff --git a/launcher/tasks/Task.h b/launcher/tasks/Task.h
index 344a024e..aafaf68c 100644
--- a/launcher/tasks/Task.h
+++ b/launcher/tasks/Task.h
@@ -1,24 +1,40 @@
-/* Copyright 2013-2021 MultiMC Contributors
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  PolyMC - Minecraft Launcher
+ *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
  */
 
 #pragma once
 
-#include <QObject>
-#include <QString>
-#include <QStringList>
-
 #include "QObjectPtr.h"
 
 class Task : public QObject {
@@ -52,6 +68,8 @@ class Task : public QObject {
 
     virtual bool canAbort() const { return false; }
 
+    auto getState() const -> State { return m_state; }
+
     QString getStatus() { return m_status; }
     virtual auto getStepStatus() const -> QString { return m_status; }
 
@@ -68,15 +86,17 @@ class Task : public QObject {
 
    signals:
     void started();
-    virtual void progress(qint64 current, qint64 total);
+    void progress(qint64 current, qint64 total);
     void finished();
     void succeeded();
+    void aborted();
     void failed(QString reason);
     void status(QString status);
+    void stepStatus(QString status);
 
    public slots:
     virtual void start();
-    virtual bool abort() { return false; };
+    virtual bool abort() { if(canAbort()) emitAborted(); return canAbort(); };
 
    protected:
     virtual void executeTask() = 0;
@@ -84,13 +104,13 @@ class Task : public QObject {
    protected slots:
     virtual void emitSucceeded();
     virtual void emitAborted();
-    virtual void emitFailed(QString reason);
+    virtual void emitFailed(QString reason = "");
 
    public slots:
     void setStatus(const QString& status);
     void setProgress(qint64 current, qint64 total);
 
-   private:
+   protected:
     State m_state = State::Inactive;
     QStringList m_Warnings;
     QString m_failReason = "";
diff --git a/launcher/tasks/Task_test.cpp b/launcher/tasks/Task_test.cpp
index 9b6cc2e5..ef153a6a 100644
--- a/launcher/tasks/Task_test.cpp
+++ b/launcher/tasks/Task_test.cpp
@@ -1,5 +1,4 @@
 #include <QTest>
-#include "TestUtil.h"
 
 #include "Task.h"