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

IosDeployStep: Introduce IosTransferTask

Browse Source 
It's going to be used in IosDeployStep.

Change-Id: I01158207c0243421a38870718cdf125499eece34
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2023-07-14 11:37:50 +02:00
parent 4ab1d75ee6
commit 109727d6de
1 changed files with 77 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/plugins/ios/iosdeploystep.cpp
View File

@@ -18,16 +18,91 @@
#include <projectexplorer/kitinformation.h> #include <projectexplorer/kitinformation.h>
#include <projectexplorer/devicesupport/devicemanager.h> #include <projectexplorer/devicesupport/devicemanager.h>
#include <solutions/tasking/tasktree.h>
#include <utils/temporaryfile.h> #include <utils/temporaryfile.h>
#include <QFile> #include <QFile>
#include <QSettings> #include <QSettings>
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Tasking;
using namespace Utils; using namespace Utils;
namespace Ios::Internal { namespace Ios::Internal {
class IosTransfer : public QObject
{
Q_OBJECT
public:
void setDeviceType(const IosDeviceType &deviceType) { m_deviceType = deviceType; }
void setBundlePath(const FilePath &bundlePath) { m_bundlePath = bundlePath; }
void setExpectSuccess(bool success) { m_expectSuccess = success; }
void start()
{
QTC_ASSERT(m_deviceType, emit done(false); return);
QTC_ASSERT(!m_toolHandler, return);
m_toolHandler.reset(new IosToolHandler(*m_deviceType));
connect(m_toolHandler.get(), &IosToolHandler::isTransferringApp, this,
[this](IosToolHandler *, const FilePath &, const QString &,
int progress, int maxProgress, const QString &info) {
emit progressValueChanged(progress * 100 / maxProgress, info);
});
connect(m_toolHandler.get(), &IosToolHandler::errorMsg, this,
[this](IosToolHandler *, const QString &message) {
if (message.contains(QLatin1String("AMDeviceInstallApplication returned -402653103")))
TaskHub::addTask(DeploymentTask(Task::Warning, Tr::tr("The Info.plist might be incorrect.")));
emit errorMessage(message);
});
connect(m_toolHandler.get(), &IosToolHandler::didTransferApp, this,
[this](IosToolHandler *, const FilePath &, const QString &,
IosToolHandler::OpStatus status) {
disconnect(m_toolHandler.get(), nullptr, this, nullptr);
m_toolHandler.release()->deleteLater();
if (status != IosToolHandler::Success && m_expectSuccess) {
TaskHub::addTask(DeploymentTask(Task::Error, Tr::tr("Deployment failed. "
"The settings in the Devices window of Xcode might be incorrect.")));
}
emit done(status == IosToolHandler::Success);
});
connect(m_toolHandler.get(), &IosToolHandler::finished, this, [this] {
disconnect(m_toolHandler.get(), nullptr, this, nullptr);
m_toolHandler.release()->deleteLater();
TaskHub::addTask(DeploymentTask(Task::Error, Tr::tr("Deployment failed.")));
emit done(false);
});
m_toolHandler->requestTransferApp(m_bundlePath, m_deviceType->identifier);
}
signals:
void done(bool success);
void progressValueChanged(int progress, const QString &info); // progress in %
void errorMessage(const QString &message);
private:
std::optional<IosDeviceType> m_deviceType;
FilePath m_bundlePath;
bool m_expectSuccess = true;
std::unique_ptr<IosToolHandler> m_toolHandler;
};
class IosTransferTaskAdapter : public TaskAdapter<IosTransfer>
{
public:
IosTransferTaskAdapter() { connect(task(), &IosTransfer::done, this, &TaskInterface::done); }
private:
void start() final { task()->start(); }
};
} // Ios::Internal
TASKING_DECLARE_TASK(IosTransferTask, Ios::Internal::IosTransferTaskAdapter);
namespace Ios::Internal {
class IosDeployStep final : public BuildStep class IosDeployStep final : public BuildStep
{ {
public: public:
@@ -293,3 +368,5 @@ IosDeployStepFactory::IosDeployStepFactory()
} }
} // Ios::Internal } // Ios::Internal
#include "iosdeploystep.moc"