mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-12-27 03:14:49 +00:00
Code Issues Projects Releases Wiki Activity

Filter console output, no more sea of red when there's nothing to report.

Browse Source
This commit is contained in:
Petr Mrázek 2013-03-26 14:34:34 +01:00
parent d2eef6974b
commit d24c4823ef
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmultimc/include/minecraftprocess.h
View File

@ -104,6 +104,8 @@ protected:
InstancePtr m_instance; InstancePtr m_instance;
QString m_user; QString m_user;
QString m_session; QString m_session;
QString m_err_leftover;
QString m_out_leftover;
QProcess m_prepostlaunchprocess; QProcess m_prepostlaunchprocess;
QStringList m_arguments; QStringList m_arguments;

33
libmultimc/src/minecraftprocess.cpp
View File

@ -125,12 +125,41 @@ MinecraftProcess::MinecraftProcess(InstancePtr inst, QString user, QString sessi
// console window // console window
void MinecraftProcess::on_stdErr() void MinecraftProcess::on_stdErr()
{ {
emit log(readAllStandardError(), MessageLevel::Error); QByteArray data = readAllStandardError();
QString str = m_err_leftover + QString::fromLocal8Bit(data);
m_err_leftover.clear();
QStringList lines = str.split("\n");
bool complete = str.endsWith("\n");
for(int i = 0; i < lines.size() - 1; i++)
{
QString & line = lines[i];
MessageLevel::Enum level = MessageLevel::Error;
if(line.contains("[INFO]") || line.contains("[CONFIG]") || line.contains("[FINE]") || line.contains("[FINER]") || line.contains("[FINEST]") )
level = MessageLevel::Message;
if(line.contains("[SEVERE]") || line.contains("[WARNING]") || line.contains("[STDERR]"))
level = MessageLevel::Error;
emit log(lines[i].toLocal8Bit(), level);
}
if(!complete)
m_err_leftover = lines.last();
} }
void MinecraftProcess::on_stdOut() void MinecraftProcess::on_stdOut()
{ {
emit log(readAllStandardOutput(), MessageLevel::Message); QByteArray data = readAllStandardOutput();
QString str = m_out_leftover + QString::fromLocal8Bit(data);
m_out_leftover.clear();
QStringList lines = str.split("\n");
bool complete = str.endsWith("\n");
for(int i = 0; i < lines.size() - 1; i++)
{
QString & line = lines[i];
emit log(lines[i].toLocal8Bit(), MessageLevel::Message);
}
if(!complete)
m_out_leftover = lines.last();
} }
// exit handler // exit handler