Skip to content

Commit c4a7d16

Browse files
committed
io/process: emit read for data remaining in buffer on exit
1 parent 89e796c commit c4a7d16

File tree

3 files changed

+8
-0
lines changed

3 files changed

+8
-0
lines changed

src/io/datastream.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ void SplitParser::parseBytes(QByteArray& incoming, QByteArray& buffer) {
9898
}
9999
}
100100

101+
void SplitParser::streamEnded(QByteArray& buffer) {
102+
if (!buffer.isEmpty()) emit this->read(QString(buffer));
103+
}
104+
101105
QString SplitParser::splitMarker() const { return this->mSplitMarker; }
102106

103107
void SplitParser::setSplitMarker(QString marker) {

src/io/datastream.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ class DataStreamParser: public QObject {
5454

5555
// the buffer will be sent in both slots if there is data remaining from a previous parser
5656
virtual void parseBytes(QByteArray& incoming, QByteArray& buffer) = 0;
57+
virtual void streamEnded(QByteArray& /*buffer*/) {};
5758

5859
signals:
5960
/// Emitted when data is read from the stream.
@@ -75,6 +76,7 @@ class SplitParser: public DataStreamParser {
7576
explicit SplitParser(QObject* parent = nullptr): DataStreamParser(parent) {}
7677

7778
void parseBytes(QByteArray& incoming, QByteArray& buffer) override;
79+
void streamEnded(QByteArray& buffer) override;
7880

7981
[[nodiscard]] QString splitMarker() const;
8082
void setSplitMarker(QString marker);

src/io/process.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,8 @@ void Process::onStarted() {
254254
void Process::onFinished(qint32 exitCode, QProcess::ExitStatus exitStatus) {
255255
this->process->deleteLater();
256256
this->process = nullptr;
257+
if (this->mStdoutParser) this->mStdoutParser->streamEnded(this->stdoutBuffer);
258+
if (this->mStderrParser) this->mStderrParser->streamEnded(this->stderrBuffer);
257259
this->stdoutBuffer.clear();
258260
this->stderrBuffer.clear();
259261

0 commit comments

Comments
 (0)