CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: move functions to utils + code-review fixes

Browse Source 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers
2023-05-06 19:10:58 -07:00
parent d0b6f0124b
commit 62a402d05a
10 changed files with 194 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
launcher/tasks/ConcurrentTask.h
View File

@ -35,17 +35,17 @@
*/
#pragma once
#include <QUuid>
#include <QHash>
#include <QQueue>
#include <QSet>
#include <QUuid>
#include <memory>
#include "tasks/Task.h"
class ConcurrentTask : public Task {
Q_OBJECT
public:
public:
using Ptr = shared_qobject_ptr<ConcurrentTask>;
explicit ConcurrentTask(QObject* parent = nullptr, QString task_name = "", int max_concurrent = 6);
@ -58,7 +58,7 @@ public:
void addTask(Task::Ptr task);
public slots:
public slots:
bool abort() override;
/** Resets the internal state of the task.
@ -66,20 +66,19 @@ public slots:
*/
void clear();
protected
slots:
protected slots:
void executeTask() override;
virtual void startNext();
void subTaskSucceeded(Task::Ptr);
void subTaskFailed(Task::Ptr, const QString &msg);
void subTaskStatus(Task::Ptr task, const QString &msg);
void subTaskDetails(Task::Ptr task, const QString &msg);
void subTaskFailed(Task::Ptr, const QString& msg);
void subTaskStatus(Task::Ptr task, const QString& msg);
void subTaskDetails(Task::Ptr task, const QString& msg);
void subTaskProgress(Task::Ptr task, qint64 current, qint64 total);
void subTaskStepProgress(Task::Ptr task, TaskStepProgress const& task_step_progress);
protected:
protected:
// NOTE: This is not thread-safe.
[[nodiscard]] unsigned int totalSize() const { return m_queue.size() + m_doing.size() + m_done.size(); }
@ -88,13 +87,13 @@ protected:
virtual void updateState();
protected:
protected:
QString m_name;
QString m_step_status;
QQueue<Task::Ptr> m_queue;
QHash<Task*, Task::Ptr> m_doing;
QHash<Task*, Task::Ptr> m_doing;
QHash<Task*, Task::Ptr> m_done;
QHash<Task*, Task::Ptr> m_failed;
QHash<Task*, Task::Ptr> m_succeeded;