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

TaskTree: Use common done handler

Browse Source 
Instead of specifying two separate done and error handlers,
specify just one that takes additional "bool success" argument.

Task-number: QTCREATORBUG-29834
Change-Id: Ie4f92236a38b03dac3dd33b2c80a317b62772a12
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2023-11-02 16:14:50 +01:00
parent 0e7ecee489
commit 0fa16f8489
21 changed files with 209 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,26 +67,25 @@ QString TarPackageDeployStep::remoteFilePath() const
GroupItem TarPackageDeployStep::uploadTask()
{
const auto setupHandler = [this](FileTransfer &transfer) {
const auto onSetup = [this](FileTransfer &transfer) {
const FilesToTransfer files {{m_packageFilePath,
deviceConfiguration()->filePath(remoteFilePath())}};
transfer.setFilesToTransfer(files);
connect(&transfer, &FileTransfer::progress, this, &TarPackageDeployStep::addProgressMessage);
addProgressMessage(Tr::tr("Uploading package to device..."));
};
const auto doneHandler = [this](const FileTransfer &) {
addProgressMessage(Tr::tr("Successfully uploaded package file."));
const auto onDone = [this](const FileTransfer &transfer, bool success) {
if (success)
addProgressMessage(Tr::tr("Successfully uploaded package file."));
else
addErrorMessage(transfer.resultData().m_errorString);
};
const auto errorHandler = [this](const FileTransfer &transfer) {
const ProcessResultData result = transfer.resultData();
addErrorMessage(result.m_errorString);
};
return FileTransferTask(setupHandler, doneHandler, errorHandler);
return FileTransferTask(onSetup, onDone);
}
GroupItem TarPackageDeployStep::installTask()
{
const auto setupHandler = [this](Process &process) {
const auto onSetup = [this](Process &process) {
const QString cmdLine = QLatin1String("cd / && tar xvf ") + remoteFilePath()
+ " && (rm " + remoteFilePath() + " || :)";
process.setCommand({deviceConfiguration()->filePath("/bin/sh"), {"-c", cmdLine}});
@@ -99,14 +98,15 @@ GroupItem TarPackageDeployStep::installTask()
});
addProgressMessage(Tr::tr("Installing package to device..."));
};
const auto doneHandler = [this](const Process &) {
saveDeploymentTimeStamp(DeployableFile(m_packageFilePath, {}), {});
addProgressMessage(Tr::tr("Successfully installed package file."));
};
const auto errorHandler = [this](const Process &process) {
const auto onDone = [this](const Process &process, bool success) {
if (success) {
saveDeploymentTimeStamp(DeployableFile(m_packageFilePath, {}), {});
addProgressMessage(Tr::tr("Successfully installed package file."));
return;
}
addErrorMessage(Tr::tr("Installing package failed.") + process.errorString());
};
return ProcessTask(setupHandler, doneHandler, errorHandler);
return ProcessTask(onSetup, onDone);
}
GroupItem TarPackageDeployStep::deployRecipe()