AbstractRemoteLinuxDeployService: Refactor API

Instead of implementing two virtual methods:
- doDeploy
- stopDeployment
provide just one to be implemented:
- deployRecipe

The new method returns task tree description enclosed in
Group recipe. The abstract deploy service constructs the
TaskTree when needed, applies the recipe and starts the tree.

Change-Id: I36e52935f98736dafeea6be32fde5595410db077
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-11-24 21:45:00 +01:00
parent bec3b9279b
commit f2f1b7c2d7
10 changed files with 60 additions and 182 deletions

View File

@@ -16,8 +16,6 @@
#include <utils/processinterface.h>
#include <utils/qtcprocess.h>
#include <QDateTime>
using namespace ProjectExplorer;
using namespace Utils;
using namespace Utils::Tasking;
@@ -31,15 +29,12 @@ public:
private:
QString remoteFilePath() const;
bool isDeploymentNecessary() const override;
void doDeploy() override;
void stopDeployment() override;
bool isDeploymentNecessary() const final;
Group deployRecipe() final;
TaskItem uploadTask();
TaskItem installTask();
FilePath m_packageFilePath;
std::unique_ptr<TaskTree> m_taskTree;
};
void TarPackageDeployService::setPackageFilePath(const FilePath &filePath)
@@ -102,28 +97,9 @@ TaskItem TarPackageDeployService::installTask()
return Process(setupHandler, doneHandler, errorHandler);
}
void TarPackageDeployService::doDeploy()
Group TarPackageDeployService::deployRecipe()
{
QTC_ASSERT(!m_taskTree, return);
const auto finishHandler = [this] {
m_taskTree.release()->deleteLater();
stopDeployment();
};
const Group root {
uploadTask(),
installTask(),
OnGroupDone(finishHandler),
OnGroupError(finishHandler),
};
m_taskTree.reset(new TaskTree(root));
m_taskTree->start();
}
void TarPackageDeployService::stopDeployment()
{
m_taskTree.reset();
handleDeploymentDone();
return Group { uploadTask(), installTask() };
}
// TarPackageDeployStep