diff --git a/src/kpackage/private/packagejob.cpp b/src/kpackage/private/packagejob.cpp index 3d7e88c..9be5c65 100644 --- a/src/kpackage/private/packagejob.cpp +++ b/src/kpackage/private/packagejob.cpp @@ -1,131 +1,131 @@ /****************************************************************************** * Copyright 2012 Sebastian Kügler * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Library General Public * * License as published by the Free Software Foundation; either * * version 2 of the License, or (at your option) any later version. * * * * This library is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * * Library General Public License for more details. * * * * You should have received a copy of the GNU Library General Public License * * along with this library; see the file COPYING.LIB. If not, write to * * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301, USA. * *******************************************************************************/ #include "packagejob_p.h" #include "packagejobthread_p.h" #include "config-package.h" #include "package_p.h" #include "kpackage_debug.h" #include #include namespace KPackage { class PackageJobPrivate { public: PackageJobThread *thread; Package *package; QString installPath; }; PackageJob::PackageJob(Package *package, QObject *parent) : KJob(parent) { d = new PackageJobPrivate; d->thread = new PackageJobThread(this); d->package = package; connect(PackageDeletionNotifier::self(), &PackageDeletionNotifier::packageDeleted, this, [this](Package *package) { if (package == d->package) { d->package = nullptr; } }); connect(d->thread, &PackageJobThread::installPathChanged, this, [this](const QString &installPath) { if (d->package) { d->package->setPath(installPath); } emit installPathChanged(installPath); }, Qt::QueuedConnection); } PackageJob::~PackageJob() { delete d; } void PackageJob::slotFinished(bool ok, const QString &err) { if (ok) { setError(NoError); } else { setError(d->thread->errorCode()); setErrorText(err); } d->thread->exit(0); emitResult(); } void PackageJob::start() { d->thread->start(); } void PackageJob::install(const QString &src, const QString &dest) { - + const QString pluginId = d->package->metadata().pluginId(); + const QStringList serviceTypes = d->package->metadata().serviceTypes(); + //d-package can become dangling during the job if deleted externally connect(d->thread, &PackageJobThread::finished, this, [=](bool ok, const QString &error) { if (ok) { - const QString pluginId = d->package->metadata().pluginId(); - const QStringList serviceTypes = d->package->metadata().serviceTypes(); for (auto& packageType: serviceTypes) { auto msg = QDBusMessage::createSignal(QStringLiteral("/KPackage/") + packageType, QStringLiteral("org.kde.plasma.kpackage"), QStringLiteral("packageInstalled")); msg.setArguments({pluginId}); QDBusConnection::sessionBus().send(msg); } } slotFinished(ok, error); }, Qt::QueuedConnection); d->thread->install(src, dest); } void PackageJob::update(const QString &src, const QString &dest) { connect(d->thread, &PackageJobThread::finished, this, [=](bool ok, const QString &error) { slotFinished(ok, error); }, Qt::QueuedConnection); d->thread->update(src, dest); } void PackageJob::uninstall(const QString &installationPath) { //capture first as uninstalling wipes d->package const QString pluginId = d->package->metadata().pluginId(); const QStringList serviceTypes = d->package->metadata().serviceTypes(); connect(d->thread, &PackageJobThread::finished, this, [=](bool ok, const QString &error) { if (ok) { for (auto& packageType: serviceTypes) { auto msg = QDBusMessage::createSignal(QStringLiteral("/KPackage/") + packageType, QStringLiteral("org.kde.plasma.kpackage"), QStringLiteral("packageUninstalled")); msg.setArguments({pluginId}); QDBusConnection::sessionBus().send(msg); } } slotFinished(ok, error); }, Qt::QueuedConnection); d->thread->uninstall(installationPath); } } // namespace KPackage #include "moc_packagejob_p.cpp"