Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-04-29 22:24:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(xml-logs): preserve whitespace lines in logs

Browse Source 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers 2025-04-28 03:08:33 -07:00
parent 1bd1245d86
commit 2c943a003d
No known key found for this signature in database
GPG Key ID: E10E321EB160949B
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
launcher/logs/LogParser.cpp
View File

@ -105,8 +105,9 @@ std::optional<LogParser::ParsedItem> LogParser::parseNext()
} }
if (m_buffer.trimmed().isEmpty()) { if (m_buffer.trimmed().isEmpty()) {
auto text = QString(m_buffer);
m_buffer.clear(); m_buffer.clear();
return {}; return LogParser::PlainText { text };
} }
// check if we have a full xml log4j event // check if we have a full xml log4j event
@ -177,11 +178,7 @@ std::optional<LogParser::ParsedItem> LogParser::parseNext()
// no log4j found, all plain text // no log4j found, all plain text
auto text = QString(m_buffer); auto text = QString(m_buffer);
m_buffer.clear(); m_buffer.clear();
if (text.trimmed().isEmpty()) { return LogParser::PlainText{ text };
return {};
} else {
return LogParser::PlainText{ text };
}
} }
} }
@ -273,11 +270,7 @@ std::optional<LogParser::ParsedItem> LogParser::parseLog4J()
auto consumed = m_parser.characterOffset(); auto consumed = m_parser.characterOffset();
if (consumed > 0 && consumed <= m_buffer.length()) { if (consumed > 0 && consumed <= m_buffer.length()) {
m_buffer = m_buffer.right(m_buffer.length() - consumed); m_buffer = m_buffer.right(m_buffer.length() - consumed);
// potential whitespace preserved for next item
if (!m_buffer.isEmpty() && m_buffer.trimmed().isEmpty()) {
// only whitespace, dump it
m_buffer.clear();
}
} }
clearError(); clearError();
return entryReady; return entryReady;