refactor: make SequentialTask inherit from ConcurrentTask

In a way, sequential tasks are just concurrent tasks with only a single
task running concurrently, so we can remove LOTS of duplicated logic :)

Signed-off-by: flow <flowlnlnln@gmail.com>

2 files changed, 24 insertions, 138 deletions

diff --git a/launcher/tasks/SequentialTask.cpp b/launcher/tasks/SequentialTask.cpp
index f1e1a889..a34137cb 100644
--- a/launcher/tasks/SequentialTask.cpp
+++ b/launcher/tasks/SequentialTask.cpp
@@ -2,107 +2,21 @@
 
 #include <QDebug>
 
-SequentialTask::SequentialTask(QObject* parent, const QString& task_name) : Task(parent), m_name(task_name), m_currentIndex(-1) {}
-
-SequentialTask::~SequentialTask()
-{
-    for(auto task : m_queue){
-        if(task)
-            task->deleteLater();
-    }
-}
-
-auto SequentialTask::getStepProgress() const -> qint64
-{
-    return m_stepProgress;
-}
-
-auto SequentialTask::getStepTotalProgress() const -> qint64
-{
-    return m_stepTotalProgress;
-}
-
-void SequentialTask::addTask(Task::Ptr task)
-{
-    m_queue.append(task);
-}
-
-void SequentialTask::executeTask()
-{
-    m_currentIndex = -1;
-    startNext();
-}
-
-bool SequentialTask::abort()
-{
-    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_aborted = true;
-        return true;
-    }
-
-    bool succeeded = m_queue[m_currentIndex]->abort();
-    m_aborted = succeeded;
-
-    if (succeeded)
-        emitAborted();
-
-    return succeeded;
-}
+SequentialTask::SequentialTask(QObject* parent, QString task_name) : ConcurrentTask(parent, task_name, 1) {}
 
 void SequentialTask::startNext()
 {
-    if (m_aborted)
-        return;
-
-    if (m_currentIndex != -1 && m_currentIndex < m_queue.size()) {
-        Task::Ptr previous = m_queue.at(m_currentIndex);
-        disconnect(previous.get(), 0, this, 0);
-    }
-
-    m_currentIndex++;
-    if (m_queue.isEmpty() || m_currentIndex >= m_queue.size()) {
-        emitSucceeded();
+    if (m_failed.size() > 0) {
+        emitFailed(tr("One of the tasks failed!"));
+        qWarning() << m_failed.constBegin()->get()->failReason();
         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)));
 
-    setStatus(tr("Executing task %1 out of %2").arg(m_currentIndex + 1).arg(m_queue.size()));
-    setStepStatus(next->isMultiStep() ? next->getStepStatus() : next->getStatus());
-
-    setProgress(m_currentIndex + 1, m_queue.count());
-
-    next->start();
+    ConcurrentTask::startNext();
 }
 
-void SequentialTask::subTaskFailed(const QString& msg)
+void SequentialTask::updateState()
 {
-    emitFailed(msg);
-}
-void SequentialTask::subTaskStatus(const QString& msg)
-{
-    setStepStatus(msg);
-}
-void SequentialTask::subTaskProgress(qint64 current, qint64 total)
-{
-    if (total == 0) {
-        setProgress(0, 100);
-        return;
-    }
-
-    m_stepProgress = current;
-    m_stepTotalProgress = total;
+    setProgress(m_done.count(), m_total_size);
+    setStatus(tr("Executing task %1 out of %2").arg(QString::number(m_doing.count() + m_done.count()), QString::number(m_total_size)));
 }
diff --git a/launcher/tasks/SequentialTask.h b/launcher/tasks/SequentialTask.h
index f5a58b1b..5eace96e 100644
--- a/launcher/tasks/SequentialTask.h
+++ b/launcher/tasks/SequentialTask.h
@@ -1,49 +1,21 @@
 #pragma once
 
-#include "Task.h"
-#include "QObjectPtr.h"
-
-#include <QQueue>
-
-class SequentialTask : public Task
-{
+#include "ConcurrentTask.h"
+
+/** A concurrent task that only allows one concurrent task :)
+ *
+ *  This should be used when there's a need to maintain a strict ordering of task executions, and
+ *  the starting of a task is contingent on the success of the previous one.
+ *
+ *  See MultipleOptionsTask if that's not the case.
+ */
+class SequentialTask : public ConcurrentTask {
     Q_OBJECT
-public:
-    explicit SequentialTask(QObject *parent = nullptr, const QString& task_name = "");
-    virtual ~SequentialTask();
-
-    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();
-    virtual void subTaskFailed(const QString &msg);
-    virtual void subTaskStatus(const QString &msg);
-    virtual void subTaskProgress(qint64 current, qint64 total);
-
-protected:
-    void setStepStatus(QString status) { m_step_status = status; emit stepStatus(status); };
-
-protected:
-    QString m_name;
-    QString m_step_status;
-
-    QQueue<Task::Ptr > m_queue;
-    int m_currentIndex;
-
-    qint64 m_stepProgress = 0;
-    qint64 m_stepTotalProgress = 100;
+   public:
+    explicit SequentialTask(QObject* parent = nullptr, QString task_name = "");
+    ~SequentialTask() override = default;
 
-    bool m_aborted = false;
+   protected:
+    void startNext() override;
+    void updateState() override;
 };