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

FileTransfer: Make it possible to call stop() from done() handler

Browse Source 
Don't delete the TransferInterface directly from stop().
Disconnect from it and delete it later.

Fix emitting done() signal when error occurred.

Fix passing the proper enum to RsyncTransferImpl.

Set proper parent for TransferInterface.

Change-Id: I430f0bf2507de8a9b7fb610641ca86e37ccd80d9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Jarek Kobus
2022-05-19 22:40:37 +02:00
parent 8fb4d058ec
commit 79cacd354d
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/remotelinux/linuxdevice.cpp
View File

@@ -1507,6 +1507,7 @@ protected:
} else { } else {
return false; return false;
} }
emit done(resultData);
return true; return true;
} }
@@ -1597,7 +1598,7 @@ class RsyncTransferImpl : public FileTransferInterface
{ {
public: public:
RsyncTransferImpl(const QString &flags) RsyncTransferImpl(const QString &flags)
: FileTransferInterface(FileTransferMethod::Sftp) : FileTransferInterface(FileTransferMethod::Rsync)
, m_flags(flags) , m_flags(flags)
{ } { }
@@ -1649,7 +1650,7 @@ private:
} }
// On Windows, rsync is either from msys or cygwin. Neither work with the other's ssh.exe. // On Windows, rsync is either from msys or cygwin. Neither work with the other's ssh.exe.
FileToTransfer fixLocalFileOnWindows(const FileToTransfer &file, const QStringList &options) FileToTransfer fixLocalFileOnWindows(const FileToTransfer &file, const QStringList &options) const
{ {
if (!HostOsInfo::isWindowsHost()) if (!HostOsInfo::isWindowsHost())
return file; return file;
@@ -1668,7 +1669,7 @@ private:
return fixedFile; return fixedFile;
} }
QPair<QString, QString> fixPaths(const FileToTransfer &file, const QString &remoteHost) QPair<QString, QString> fixPaths(const FileToTransfer &file, const QString &remoteHost) const
{ {
FilePath localPath; FilePath localPath;
FilePath remotePath; FilePath remotePath;
@@ -1698,7 +1699,7 @@ class FileTransferPrivate : public QObject
public: public:
void test() { run(TestRun); } void test() { run(TestRun); }
void start() { run(NormalRun); } void start() { run(NormalRun); }
void stop() { m_transfer.reset(); } void stop();
FileTransferMethod m_method = FileTransferMethod::Default; FileTransferMethod m_method = FileTransferMethod::Default;
IDevice::ConstPtr m_device; IDevice::ConstPtr m_device;
@@ -1721,6 +1722,19 @@ private:
std::unique_ptr<FileTransferInterface> m_transfer; std::unique_ptr<FileTransferInterface> m_transfer;
}; };
void FileTransferPrivate::stop()
{
if (!m_transfer)
return;
m_transfer->disconnect();
m_transfer.release()->deleteLater();
}
void FileTransferPrivate::startFailed(const QString &errorString)
{
emit done({0, QProcess::NormalExit, QProcess::FailedToStart, errorString});
}
void FileTransferPrivate::run(RunMode mode) void FileTransferPrivate::run(RunMode mode)
{ {
stop(); stop();
@@ -1746,7 +1760,8 @@ void FileTransferPrivate::run(RunMode mode)
m_transfer.reset(new RsyncTransferImpl(m_rsyncFlags)); m_transfer.reset(new RsyncTransferImpl(m_rsyncFlags));
break; break;
} }
QTC_ASSERT(m_transfer, startFailed(tr("Missing transfer implementation."))); QTC_ASSERT(m_transfer, startFailed(tr("Missing transfer implementation.")); return);
m_transfer->setParent(this);
m_transfer->setDevice(m_device); m_transfer->setDevice(m_device);
if (mode == NormalRun) if (mode == NormalRun)
m_transfer->setFilesToTransfer(m_files, direction); m_transfer->setFilesToTransfer(m_files, direction);
@@ -1757,11 +1772,6 @@ void FileTransferPrivate::run(RunMode mode)
m_transfer->start(); m_transfer->start();
} }
void FileTransferPrivate::startFailed(const QString &errorString)
{
emit done({0, QProcess::NormalExit, QProcess::FailedToStart, errorString});
}
FileTransfer::FileTransfer() FileTransfer::FileTransfer()
: d(new FileTransferPrivate) : d(new FileTransferPrivate)
{ {