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

ProjectExplorer: collect rsync and sftp asynchronously

Browse Source 
Change-Id: I4903981954b31f05e6f4d67bdd90256061372470
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
David Schulz
2024-10-23 08:42:58 +02:00
parent 39c957bc80
commit 74068743b6
1 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/projectexplorer/devicesupport/desktopdevice.cpp
View File

@@ -10,12 +10,13 @@
#include <coreplugin/fileutils.h> #include <coreplugin/fileutils.h>
#include <utils/async.h>
#include <utils/devicefileaccess.h> #include <utils/devicefileaccess.h>
#include <utils/environment.h> #include <utils/environment.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/portlist.h> #include <utils/portlist.h>
#include <utils/qtcprocess.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <utils/terminalcommand.h> #include <utils/terminalcommand.h>
#include <utils/terminalhooks.h> #include <utils/terminalhooks.h>
#include <utils/url.h> #include <utils/url.h>
@@ -129,14 +130,39 @@ FilePath DesktopDevice::rootPath() const
return IDevice::rootPath(); return IDevice::rootPath();
} }
struct DeployToolsAvailability
{
bool rsync;
bool sftp;
};
static DeployToolsAvailability hostDeployTools()
{
auto check = [](const QString &tool) {
return FilePath::fromPathPart(tool).searchInPath().isExecutableFile();
};
return {check("rsync"), check("sftp")};
}
void DesktopDevice::fromMap(const Store &map) void DesktopDevice::fromMap(const Store &map)
{ {
IDevice::fromMap(map); IDevice::fromMap(map);
const FilePath rsync = FilePath::fromString("rsync").searchInPath(); auto updateExtraData = [this](const DeployToolsAvailability &tools) {
const FilePath sftp = FilePath::fromString("sftp").searchInPath(); setExtraData(Constants::SUPPORTS_RSYNC, tools.rsync);
setExtraData(Constants::SUPPORTS_RSYNC, rsync.isExecutableFile()); setExtraData(Constants::SUPPORTS_SFTP, tools.sftp);
setExtraData(Constants::SUPPORTS_SFTP, sftp.isExecutableFile()); };
if (HostOsInfo::isWindowsHost()) {
QFutureWatcher<DeployToolsAvailability> *w = new QFutureWatcher<DeployToolsAvailability>(this);
connect(w, &QFutureWatcher<DeployToolsAvailability>::finished, this, [w, updateExtraData]() {
updateExtraData(w->result());
w->deleteLater();
});
w->setFuture(Utils::asyncRun([]() { return hostDeployTools(); }));
} else {
updateExtraData(hostDeployTools());
}
} }
} // namespace ProjectExplorer } // namespace ProjectExplorer