diff options
Diffstat (limited to 'api/logic/InstanceCopyTask.cpp')
| -rw-r--r-- | api/logic/InstanceCopyTask.cpp | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/api/logic/InstanceCopyTask.cpp b/api/logic/InstanceCopyTask.cpp index 1e231478..3150c383 100644 --- a/api/logic/InstanceCopyTask.cpp +++ b/api/logic/InstanceCopyTask.cpp @@ -4,6 +4,7 @@ #include "FileSystem.h" #include "NullInstance.h" #include "pathmatcher/RegexpMatcher.h" +#include <QtConcurrentRun> InstanceCopyTask::InstanceCopyTask(SettingsObjectPtr settings, BaseInstanceProvider* target, InstancePtr origInstance, const QString& instName, const QString& instIcon, const QString& instGroup, bool copySaves) { @@ -28,26 +29,42 @@ void InstanceCopyTask::executeTask() matcher.reset(matcherReal); } - QString stagingPath = m_target->getStagedInstancePath(); - FS::copy folderCopy(m_origInstance->instanceRoot(), stagingPath); + m_stagingPath = m_target->getStagedInstancePath(); + FS::copy folderCopy(m_origInstance->instanceRoot(), m_stagingPath); folderCopy.followSymlinks(false).blacklist(matcher.get()); - if (!folderCopy()) + + m_copyFuture = QtConcurrent::run(QThreadPool::globalInstance(), folderCopy); + connect(&m_copyFutureWatcher, &QFutureWatcher<bool>::finished, this, &InstanceCopyTask::copyFinished); + connect(&m_copyFutureWatcher, &QFutureWatcher<bool>::canceled, this, &InstanceCopyTask::copyAborted); + m_copyFutureWatcher.setFuture(m_copyFuture); +} + +void InstanceCopyTask::copyFinished() +{ + auto successful = m_copyFuture.result(); + if(!successful) { - m_target->destroyStagingPath(stagingPath); + m_target->destroyStagingPath(m_stagingPath); emitFailed(tr("Instance folder copy failed.")); return; } - // FIXME: shouldn't this be able to report errors? - auto instanceSettings = std::make_shared<INISettingsObject>(FS::PathCombine(stagingPath, "instance.cfg")); + auto instanceSettings = std::make_shared<INISettingsObject>(FS::PathCombine(m_stagingPath, "instance.cfg")); instanceSettings->registerSetting("InstanceType", "Legacy"); // FIXME: and this too? errors??? - m_origInstance->copy(stagingPath); + m_origInstance->copy(m_stagingPath); - InstancePtr inst(new NullInstance(m_globalSettings, instanceSettings, stagingPath)); + InstancePtr inst(new NullInstance(m_globalSettings, instanceSettings, m_stagingPath)); inst->setName(m_instName); inst->setIconKey(m_instIcon); - m_target->commitStagedInstance(stagingPath, stagingPath, m_instName, m_instGroup); + m_target->commitStagedInstance(m_stagingPath, m_stagingPath, m_instName, m_instGroup); emitSucceeded(); } + +void InstanceCopyTask::copyAborted() +{ + m_target->destroyStagingPath(m_stagingPath); + emitFailed(tr("Instance folder copy has been aborted.")); + return; +} |