Github/PrismLauncher
1
0
Fork 1
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-07-08 13:08:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into fix-log-level-bleed

Browse source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2025-12-08 09:21:27 +00:00 • committed by GitHub
commit 4f5e348b66
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
35 changed files with 135 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

4
launcher/launch/LaunchStep.h
View file

@ -28,8 +28,8 @@ class LaunchStep : public Task {
virtual ~LaunchStep() = default;
signals:
void logLines(QStringList lines, MessageLevel::Enum level);
void logLine(QString line, MessageLevel::Enum level);
void logLines(QStringList lines, MessageLevel level);
void logLine(QString line, MessageLevel level);
void readyForLaunch();
void progressReportingRequest();

8
launcher/launch/LaunchTask.cpp
View file

@ -214,7 +214,7 @@ shared_qobject_ptr<LogModel> LaunchTask::getLogModel()
return m_logModel;
}
bool LaunchTask::parseXmlLogs(QString const& line, MessageLevel::Enum level)
bool LaunchTask::parseXmlLogs(QString const& line, MessageLevel level)
{
LogParser* parser;
switch (level) {
@ -254,7 +254,7 @@ bool LaunchTask::parseXmlLogs(QString const& line, MessageLevel::Enum level)
} else if (std::holds_alternative<LogParser::PlainText>(item)) {
auto msg = std::get<LogParser::PlainText>(item).message;
MessageLevel::Enum newLevel = MessageLevel::fromLine(msg);
MessageLevel newLevel = messageLevelFromLine(msg);
if (newLevel == MessageLevel::Unknown)
newLevel = LogParser::guessLevel(line, model->previousLevel());
@ -268,14 +268,14 @@ bool LaunchTask::parseXmlLogs(QString const& line, MessageLevel::Enum level)
return true;
}
void LaunchTask::onLogLines(const QStringList& lines, MessageLevel::Enum defaultLevel)
void LaunchTask::onLogLines(const QStringList& lines, MessageLevel defaultLevel)
{
for (auto& line : lines) {
onLogLine(line, defaultLevel);
}
}
void LaunchTask::onLogLine(QString line, MessageLevel::Enum level)
void LaunchTask::onLogLine(QString line, MessageLevel level)
{
if (parseXmlLogs(line, level)) {
return;

6
launcher/launch/LaunchTask.h
View file

@ -106,8 +106,8 @@ class LaunchTask : public Task {
void requestLogging();
public slots:
void onLogLines(const QStringList& lines, MessageLevel::Enum defaultLevel = MessageLevel::Launcher);
void onLogLine(QString line, MessageLevel::Enum defaultLevel = MessageLevel::Launcher);
void onLogLines(const QStringList& lines, MessageLevel defaultLevel = MessageLevel::Launcher);
void onLogLine(QString line, MessageLevel defaultLevel = MessageLevel::Launcher);
void onReadyForLaunch();
void onStepFinished();
void onProgressReportingRequested();
@ -116,7 +116,7 @@ class LaunchTask : public Task {
void finalizeSteps(bool successful, const QString& error);
protected:
bool parseXmlLogs(QString const& line, MessageLevel::Enum level);
bool parseXmlLogs(QString const& line, MessageLevel level);
protected: /* data */
MinecraftInstancePtr m_instance;

6
launcher/launch/LogModel.cpp
View file

@ -24,13 +24,13 @@ QVariant LogModel::data(const QModelIndex& index, int role) const
return m_content[realRow].line;
}
if (role == LevelRole) {
return m_content[realRow].level;
return static_cast<int>(m_content[realRow].level);
}
return QVariant();
}
void LogModel::append(MessageLevel::Enum level, QString line)
void LogModel::append(MessageLevel level, QString line)
{
if (m_suspended) {
return;
@ -167,7 +167,7 @@ bool LogModel::isOverFlow()
return m_numLines >= m_maxLines && m_stopOnOverflow;
}
MessageLevel::Enum LogModel::previousLevel()
MessageLevel LogModel::previousLevel()
{
if (m_numLines > 0) {
return m_content[m_numLines - 1].level;

6
launcher/launch/LogModel.h
View file

@ -12,7 +12,7 @@ class LogModel : public QAbstractListModel {
int rowCount(const QModelIndex& parent = QModelIndex()) const;
QVariant data(const QModelIndex& index, int role) const;
void append(MessageLevel::Enum, QString line);
void append(MessageLevel, QString line);
void clear();
void suspend(bool suspend);
@ -31,13 +31,13 @@ class LogModel : public QAbstractListModel {
void setColorLines(bool state);
bool colorLines() const;
MessageLevel::Enum previousLevel();
MessageLevel previousLevel();
enum Roles { LevelRole = Qt::UserRole };
private /* types */:
struct entry {
MessageLevel::Enum level = MessageLevel::Enum::Unknown;
MessageLevel level = MessageLevel::Unknown;
QString line;
};

4
launcher/launch/steps/TextPrint.cpp
View file

@ -1,11 +1,11 @@
#include "TextPrint.h"
TextPrint::TextPrint(LaunchTask* parent, const QStringList& lines, MessageLevel::Enum level) : LaunchStep(parent)
TextPrint::TextPrint(LaunchTask* parent, const QStringList& lines, MessageLevel level) : LaunchStep(parent)
{
m_lines = lines;
m_level = level;
}
TextPrint::TextPrint(LaunchTask* parent, const QString& line, MessageLevel::Enum level) : LaunchStep(parent)
TextPrint::TextPrint(LaunchTask* parent, const QString& line, MessageLevel level) : LaunchStep(parent)
{
m_lines.append(line);
m_level = level;

6
launcher/launch/steps/TextPrint.h
View file

@ -26,8 +26,8 @@
class TextPrint : public LaunchStep {
Q_OBJECT
public:
explicit TextPrint(LaunchTask* parent, const QStringList& lines, MessageLevel::Enum level);
explicit TextPrint(LaunchTask* parent, const QString& line, MessageLevel::Enum level);
explicit TextPrint(LaunchTask* parent, const QStringList& lines, MessageLevel level);
explicit TextPrint(LaunchTask* parent, const QString& line, MessageLevel level);
virtual ~TextPrint() {};
virtual void executeTask();
@ -36,5 +36,5 @@ class TextPrint : public LaunchStep {
private:
QStringList m_lines;
MessageLevel::Enum m_level;
MessageLevel m_level;
};