dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Propagate task warnings

Browse source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2025-04-29 16:46:11 +01:00
parent acdb8c5578
commit 24036021bb
No known key found for this signature in database
GPG key ID: 5E39D70B4C93C38E
3 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
launcher/InstanceImportTask.cpp
View file

@ -212,6 +212,7 @@ void InstanceImportTask::processZipPack()
progressStep->status = status; progressStep->status = status;
stepProgress(*progressStep); stepProgress(*progressStep);
}); });
connect(zipTask.get(), &Task::warningLogged, this, [this](const QString& line) { m_Warnings.append(line); });
m_task.reset(zipTask); m_task.reset(zipTask);
zipTask->start(); zipTask->start();
} }
@ -308,6 +309,8 @@ void InstanceImportTask::processFlame()
connect(inst_creation_task.get(), &Task::aborted, this, &Task::abort); connect(inst_creation_task.get(), &Task::aborted, this, &Task::abort);
connect(inst_creation_task.get(), &Task::abortStatusChanged, this, &Task::setAbortable); connect(inst_creation_task.get(), &Task::abortStatusChanged, this, &Task::setAbortable);
connect(inst_creation_task.get(), &Task::warningLogged, this, [this](const QString& line) { m_Warnings.append(line); });
m_task.reset(inst_creation_task); m_task.reset(inst_creation_task);
setAbortable(true); setAbortable(true);
m_task->start(); m_task->start();
@ -407,6 +410,8 @@ void InstanceImportTask::processModrinth()
connect(inst_creation_task.get(), &Task::aborted, this, &Task::abort); connect(inst_creation_task.get(), &Task::aborted, this, &Task::abort);
connect(inst_creation_task.get(), &Task::abortStatusChanged, this, &Task::setAbortable); connect(inst_creation_task.get(), &Task::abortStatusChanged, this, &Task::setAbortable);
connect(inst_creation_task.get(), &Task::warningLogged, this, [this](const QString& line) { m_Warnings.append(line); });
m_task.reset(inst_creation_task); m_task.reset(inst_creation_task);
setAbortable(true); setAbortable(true);
m_task->start(); m_task->start();

2
launcher/tasks/Task.cpp
View file

@ -196,6 +196,8 @@ void Task::logWarning(const QString& line)
{ {
qWarning() << line; qWarning() << line;
m_Warnings.append(line); m_Warnings.append(line);
emit warningLogged(line);
} }
QStringList Task::warnings() const QStringList Task::warnings() const

1
launcher/tasks/Task.h
View file

@ -145,6 +145,7 @@ class Task : public QObject, public QRunnable {
void failed(QString reason); void failed(QString reason);
void status(QString status); void status(QString status);
void details(QString details); void details(QString details);
void warningLogged(const QString& warning);
void stepProgress(TaskStepProgress const& task_progress); void stepProgress(TaskStepProgress const& task_progress);
//! Emitted when the canAbort() status has changed. */ //! Emitted when the canAbort() status has changed. */