refactor: make MultipleOptionsTask inherit from ConcurrentTask too

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

2 files changed, 18 insertions, 41 deletions

diff --git a/launcher/tasks/MultipleOptionsTask.cpp b/launcher/tasks/MultipleOptionsTask.cpp
index 6e853568..7741bef0 100644
--- a/launcher/tasks/MultipleOptionsTask.cpp
+++ b/launcher/tasks/MultipleOptionsTask.cpp
@@ -2,47 +2,26 @@
 
 #include <QDebug>
 
-MultipleOptionsTask::MultipleOptionsTask(QObject* parent, const QString& task_name) : SequentialTask(parent, task_name) {}
+MultipleOptionsTask::MultipleOptionsTask(QObject* parent, const QString& task_name) : ConcurrentTask(parent, task_name) {}
 
 void MultipleOptionsTask::startNext()
 {
-    Task* previous = nullptr;
-    if (m_currentIndex != -1) {
-        previous = m_queue[m_currentIndex].get();
-        disconnect(previous, 0, this, 0);
-    }
-
-    m_currentIndex++;
-    if ((previous && previous->wasSuccessful())) {
+    if (m_done.size() != m_failed.size()) {
         emitSucceeded();
         return;
     }
 
-    Task::Ptr next = m_queue[m_currentIndex];
-
-    connect(next.get(), &Task::failed, this, &MultipleOptionsTask::subTaskFailed);
-    connect(next.get(), &Task::succeeded, this, &MultipleOptionsTask::startNext);
-
-    connect(next.get(), &Task::status, this, &MultipleOptionsTask::subTaskStatus);
-    connect(next.get(), &Task::stepStatus, this, &MultipleOptionsTask::subTaskStatus);
-    
-    connect(next.get(), &Task::progress, this, &MultipleOptionsTask::subTaskProgress);
-
-    qDebug() << QString("Making attemp %1 out of %2").arg(m_currentIndex + 1).arg(m_queue.size());
-    setStatus(tr("Making attempt #%1 out of %2").arg(m_currentIndex + 1).arg(m_queue.size()));
-    setStepStatus(next->isMultiStep() ? next->getStepStatus() : next->getStatus());
+    if (m_queue.isEmpty()) {
+        emitFailed(tr("All attempts have failed!"));
+        qWarning() << "All attempts have failed!";
+        return;
+    }
 
-    next->start();
+    ConcurrentTask::startNext();
 }
 
-void MultipleOptionsTask::subTaskFailed(QString const& reason)
+void MultipleOptionsTask::updateState()
 {
-    qDebug() << QString("Failed attempt #%1 of %2. Reason: %3").arg(m_currentIndex + 1).arg(m_queue.size()).arg(reason);
-    if(m_currentIndex < m_queue.size() - 1) {
-        startNext();
-        return;
-    }
-
-    qWarning() << QString("All attempts have failed!");
-    emitFailed();
+    setProgress(m_done.count(), m_total_size);
+    setStatus(tr("Attempting task %1 out of %2").arg(QString::number(m_doing.count() + m_done.count()), QString::number(m_total_size)));
 }
diff --git a/launcher/tasks/MultipleOptionsTask.h b/launcher/tasks/MultipleOptionsTask.h
index 7c508b00..c65356b0 100644
--- a/launcher/tasks/MultipleOptionsTask.h
+++ b/launcher/tasks/MultipleOptionsTask.h
@@ -1,19 +1,17 @@
 #pragma once
 
-#include "SequentialTask.h"
+#include "ConcurrentTask.h"
 
 /* This task type will attempt to do run each of it's subtasks in sequence,
  * until one of them succeeds. When that happens, the remaining tasks will not run.
  * */
-class MultipleOptionsTask : public SequentialTask
-{
+class MultipleOptionsTask : public ConcurrentTask {
     Q_OBJECT
-public:
-    explicit MultipleOptionsTask(QObject *parent = nullptr, const QString& task_name = "");
-    virtual ~MultipleOptionsTask() = default;
+   public:
+    explicit MultipleOptionsTask(QObject* parent = nullptr, const QString& task_name = "");
+    ~MultipleOptionsTask() override = default;
 
-private
-slots:
+   private slots:
     void startNext() override;
-    void subTaskFailed(const QString &msg) override;
+    void updateState() override;
 };