feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Add a few convenience functions to work with process output

Browse Source 
Change-Id: I45acea77ccfdc15b1be9693c1658890865383c16
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2022-06-16 15:13:07 +02:00
parent 25b1c59f74
commit 5ee880ce5e
2 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/libs/utils/qtcprocess.cpp
View File

@@ -1361,7 +1361,7 @@ bool QtcProcess::readDataFromProcess(int timeoutS,
QString QtcProcess::normalizeNewlines(const QString &text) QString QtcProcess::normalizeNewlines(const QString &text)
{ {
QString res = text; QString res = text;
const auto newEnd = std::unique(res.begin(), res.end(), [](const QChar &c1, const QChar &c2) { const auto newEnd = std::unique(res.begin(), res.end(), [](const QChar c1, const QChar c2) {
return c1 == '\r' && c2 == '\r'; // QTCREATORBUG-24556 return c1 == '\r' && c2 == '\r'; // QTCREATORBUG-24556
}); });
res.chop(std::distance(newEnd, res.end())); res.chop(std::distance(newEnd, res.end()));
@@ -1704,10 +1704,16 @@ QString QtcProcess::allOutput() const
return !out.isEmpty() ? out : err; return !out.isEmpty() ? out : err;
} }
QByteArray QtcProcess::rawStdOut() const
{
QTC_CHECK(d->m_stdOut.keepRawData);
return d->m_stdOut.rawData;
}
QString QtcProcess::stdOut() const QString QtcProcess::stdOut() const
{ {
QTC_CHECK(d->m_stdOut.keepRawData); QTC_CHECK(d->m_stdOut.keepRawData);
return normalizeNewlines(d->m_codec->toUnicode(d->m_stdOut.rawData)); return d->m_codec->toUnicode(d->m_stdOut.rawData);
} }
QString QtcProcess::stdErr() const QString QtcProcess::stdErr() const
@@ -1717,13 +1723,37 @@ QString QtcProcess::stdErr() const
// is not trivial. So weaken it a bit for now. // is not trivial. So weaken it a bit for now.
//QTC_CHECK(d->m_stdErr.keepRawData); //QTC_CHECK(d->m_stdErr.keepRawData);
QTC_CHECK(d->m_stdErr.keepRawData || d->m_stdErr.rawData.isEmpty()); QTC_CHECK(d->m_stdErr.keepRawData || d->m_stdErr.rawData.isEmpty());
return normalizeNewlines(d->m_codec->toUnicode(d->m_stdErr.rawData)); return d->m_codec->toUnicode(d->m_stdErr.rawData);
} }
QByteArray QtcProcess::rawStdOut() const QString QtcProcess::cleanedStdOut() const
{ {
QTC_CHECK(d->m_stdOut.keepRawData); return normalizeNewlines(stdOut());
return d->m_stdOut.rawData; }
QString QtcProcess::cleanedStdErr() const
{
return normalizeNewlines(stdErr());
}
static QStringList splitLines(const QString &text)
{
QStringList result = text.split('\n');
for (QString &line : result) {
if (line.endsWith('\r'))
line.chop(1);
}
return result;
}
const QStringList QtcProcess::stdOutLines() const
{
return splitLines(stdOut());
}
const QStringList QtcProcess::stdErrLines() const
{
return splitLines(stdErr());
} }
QTCREATOR_UTILS_EXPORT QDebug operator<<(QDebug str, const QtcProcess &r) QTCREATOR_UTILS_EXPORT QDebug operator<<(QDebug str, const QtcProcess &r)

12
src/libs/utils/qtcprocess.h
View File

@@ -184,11 +184,17 @@ public:
QByteArray allRawOutput() const; QByteArray allRawOutput() const;
QString allOutput() const; QString allOutput() const;
QString stdOut() const;
QString stdErr() const;
QByteArray rawStdOut() const; QByteArray rawStdOut() const;
QString stdOut() const; // possibly with CR
QString stdErr() const; // possibly with CR
QString cleanedStdOut() const; // with CR removed
QString cleanedStdErr() const; // with CR removed
const QStringList stdOutLines() const; // split, CR removed
const QStringList stdErrLines() const; // split, CR removed
QString exitMessage() const; QString exitMessage() const;
QString toStandaloneCommandLine() const; QString toStandaloneCommandLine() const;