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

QtcSsh: Connect to QtcProcess::done() signal

Browse Source 
Instead of connecting to errorOccurred() and finished() signals.

Change-Id: I113f51564501a67725afee77ab4d20e5d954a7c0
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2022-04-05 16:09:26 +02:00
parent 5b923954c0
commit 484ea3ecc9
3 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/libs/ssh/sftpsession.cpp
View File

@@ -118,25 +118,20 @@ SftpSession::SftpSession(const QStringList &connectionArgs) : d(new SftpSessionP
qCDebug(sshLog) << "sftp process started";
d->sftpProc.write("\n"); // Force initial prompt.
});
connect(&d->sftpProc, &QtcProcess::errorOccurred, [this](QProcess::ProcessError error) {
if (error == QProcess::FailedToStart) {
d->state = State::Inactive;
emit done(tr("sftp failed to start: %1").arg(d->sftpProc.errorString()));
}
});
connect(&d->sftpProc, &QtcProcess::finished, [this] {
connect(&d->sftpProc, &QtcProcess::done, [this] {
qCDebug(sshLog) << "sftp process finished";
d->state = State::Inactive;
if (d->sftpProc.exitStatus() != QProcess::NormalExit) {
emit done(tr("sftp crashed."));
return;
}
if (d->sftpProc.exitCode() != 0) {
emit done(QString::fromLocal8Bit(d->sftpProc.readAllStandardError()));
return;
}
emit done(QString());
const QString processMessage = [this] {
if (d->sftpProc.error() == QProcess::FailedToStart)
return tr("sftp failed to start: %1").arg(d->sftpProc.errorString());
if (d->sftpProc.exitStatus() != QProcess::NormalExit)
return tr("sftp crashed.");
if (d->sftpProc.exitCode() != 0)
return QString::fromLocal8Bit(d->sftpProc.readAllStandardError());
return QString();
}();
emit done(processMessage);
});
connect(&d->sftpProc, &QtcProcess::readyReadStandardOutput, this, &SftpSession::handleStdout);
}

8
src/libs/ssh/sftptransfer.cpp
View File

@@ -114,11 +114,11 @@ SftpTransfer::SftpTransfer(const FilesToTransfer &files, Internal::FileTransferT
d->transferType = type;
d->errorHandlingMode = errorHandlingMode;
d->connectionArgs = connectionArgs;
connect(&d->sftpProc, &QtcProcess::errorOccurred, [this](QProcess::ProcessError error) {
if (error == QProcess::FailedToStart)
connect(&d->sftpProc, &QtcProcess::done, [this] {
if (d->sftpProc.error() == QProcess::FailedToStart) {
emitError(tr("sftp failed to start: %1").arg(d->sftpProc.errorString()));
});
connect(&d->sftpProc, &QtcProcess::finished, [this] {
return;
}
if (d->sftpProc.exitStatus() != QProcess::NormalExit) {
emitError(tr("sftp crashed."));
return;

15
src/libs/ssh/sshconnection.cpp
View File

@@ -186,21 +186,12 @@ SshConnection::SshConnection(const SshConnectionParameters &serverInfo, QObject
if (reply == "\n")
emitConnected();
});
connect(&d->masterProcess, &QtcProcess::errorOccurred, [this] (QProcess::ProcessError error) {
switch (error) {
case QProcess::FailedToStart:
connect(&d->masterProcess, &QtcProcess::done, this, [this] {
if (d->masterProcess.error() == QProcess::FailedToStart) {
emitError(tr("Cannot establish SSH connection: Control process failed to start: %1")
.arg(d->fullProcessError()));
break;
case QProcess::Crashed: // Handled by finished() handler.
case QProcess::Timedout:
case QProcess::ReadError:
case QProcess::WriteError:
case QProcess::UnknownError:
break; // Cannot happen.
return;
}
});
connect(&d->masterProcess, &QtcProcess::finished, [this] {
if (d->state == Disconnecting) {
emitDisconnected();
return;