mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Only continue log level if line starts with whitespace; reintroduce exception detection

Browse source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2025-12-05 12:35:21 +00:00
parent 92738feeba
commit c018b60816
No known key found for this signature in database
GPG key ID: 5E39D70B4C93C38E
5 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
launcher/launch/LaunchTask.cpp
View file

@ -257,10 +257,7 @@ bool LaunchTask::parseXmlLogs(QString const& line, MessageLevel::Enum level)
MessageLevel::Enum newLevel = MessageLevel::fromLine(msg);
if (newLevel == MessageLevel::Unknown)
newLevel = LogParser::guessLevel(line);
if (newLevel == MessageLevel::Unknown)
newLevel = model->previousLevel();
newLevel = LogParser::guessLevel(line, model->previousLevel());
msg = censorPrivateInfo(msg);

12
launcher/logs/LogParser.cpp
View file

@ -320,7 +320,7 @@ std::optional<LogParser::ParsedItem> LogParser::parseLog4J()
throw std::runtime_error("unreachable: already verified this was a complete log4j:Event");
}
MessageLevel::Enum LogParser::guessLevel(const QString& line)
MessageLevel::Enum LogParser::guessLevel(const QString& line, MessageLevel::Enum previous)
{
static const QRegularExpression LINE_WITH_LEVEL("^\\[(?<timestamp>[0-9:]+)\\] \\[[^/]+/(?<level>[^\\]]+)\\]");
auto match = LINE_WITH_LEVEL.match(line);
@ -343,11 +343,17 @@ MessageLevel::Enum LogParser::guessLevel(const QString& line)
return MessageLevel::Debug;
}
if (line.contains("Exception: ") || line.contains("Throwable: "))
return MessageLevel::Error;
if (line.startsWith("Caused by: ") || line.startsWith("Exception in thread"))
return MessageLevel::Error;
if (line.contains("overwriting existing"))
return MessageLevel::Fatal;
if (line == "---- Minecraft Crash Report ----")
return MessageLevel::Error;
if (line.startsWith("\t") || line.startsWith(" "))
return previous;
return MessageLevel::Unknown;
}

2
launcher/logs/LogParser.h
View file

@ -59,7 +59,7 @@ class LogParser {
std::optional<Error> getError();
/// guess log level from a line of game log
static MessageLevel::Enum guessLevel(const QString& line);
static MessageLevel::Enum guessLevel(const QString& line, MessageLevel::Enum previous);
protected:
std::optional<LogEntry> parseAttributes();

5
launcher/ui/pages/instance/OtherLogsPage.cpp
View file

@ -287,10 +287,7 @@ void OtherLogsPage::reload()
if (!m_instance) {
level = MessageLevel::fromLauncherLine(lineTemp);
} else {
level = LogParser::guessLevel(line);
if (level == MessageLevel::Unknown)
level = last;
level = LogParser::guessLevel(line, last);
}
last = level;

5
tests/XmlLogs_test.cpp
View file

@ -126,10 +126,7 @@ class XmlLogParseTest : public QObject {
last = entry.level;
} else if (std::holds_alternative<LogParser::PlainText>(item)) {
auto msg = std::get<LogParser::PlainText>(item).message;
auto level = LogParser::guessLevel(msg);
if (level == MessageLevel::Unknown)
level = last;
auto level = LogParser::guessLevel(msg, last);
out.append(std::make_pair(level, msg));
last = level;