Implementation for async non-static package installation
This commit is contained in:
parent
8b6a248033
commit
e0fe19e5fb
79
private/packagejob.cpp
Normal file
79
private/packagejob.cpp
Normal file
@ -0,0 +1,79 @@
|
|||||||
|
/******************************************************************************
|
||||||
|
* Copyright 2012 Sebastian Kügler <sebas@kde.org> *
|
||||||
|
* *
|
||||||
|
* 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-plasma.h"
|
||||||
|
|
||||||
|
#include <kdebug.h>
|
||||||
|
|
||||||
|
namespace Plasma
|
||||||
|
{
|
||||||
|
class PackageJobPrivate {
|
||||||
|
public:
|
||||||
|
PackageJobThread *thread;
|
||||||
|
QString installPath;
|
||||||
|
};
|
||||||
|
|
||||||
|
PackageJob::PackageJob(const QString &servicePrefix, QObject* parent) :
|
||||||
|
KJob(parent)
|
||||||
|
{
|
||||||
|
d = new PackageJobPrivate;
|
||||||
|
d->thread = new PackageJobThread(servicePrefix, this);
|
||||||
|
connect(d->thread, SIGNAL(finished(bool, const QString&)),
|
||||||
|
SLOT(slotFinished(bool, const QString&)), Qt::QueuedConnection);
|
||||||
|
connect(d->thread, SIGNAL(installPathChanged(const QString&)),
|
||||||
|
SIGNAL(installPathChanged(const QString&)), Qt::QueuedConnection);
|
||||||
|
}
|
||||||
|
|
||||||
|
PackageJob::~PackageJob()
|
||||||
|
{
|
||||||
|
delete d;
|
||||||
|
}
|
||||||
|
|
||||||
|
void PackageJob::slotFinished(bool ok, const QString &err)
|
||||||
|
{
|
||||||
|
if (ok) {
|
||||||
|
setError(NoError);
|
||||||
|
} else {
|
||||||
|
setError(UserDefinedError);
|
||||||
|
setErrorText(err);
|
||||||
|
}
|
||||||
|
d->thread->exit(0);
|
||||||
|
emitResult();
|
||||||
|
}
|
||||||
|
|
||||||
|
void PackageJob::start()
|
||||||
|
{
|
||||||
|
d->thread->start();
|
||||||
|
}
|
||||||
|
|
||||||
|
void PackageJob::install(const QString& src, const QString &dest)
|
||||||
|
{
|
||||||
|
d->thread->install(src, dest);
|
||||||
|
}
|
||||||
|
|
||||||
|
void PackageJob::uninstall(const QString& installationPath)
|
||||||
|
{
|
||||||
|
d->thread->uninstall(installationPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace Plasma
|
||||||
|
|
||||||
|
#include "moc_packagejob_p.cpp"
|
59
private/packagejob_p.h
Normal file
59
private/packagejob_p.h
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
/******************************************************************************
|
||||||
|
* Copyright 2012 Sebastian Kügler <sebas@kde.org> *
|
||||||
|
* *
|
||||||
|
* 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. *
|
||||||
|
*******************************************************************************/
|
||||||
|
|
||||||
|
#ifndef PLASMA_PACKAGEJOB_P_H
|
||||||
|
#define PLASMA_PACKAGEJOB_P_H
|
||||||
|
|
||||||
|
#include "kjob.h"
|
||||||
|
|
||||||
|
|
||||||
|
namespace Plasma
|
||||||
|
{
|
||||||
|
|
||||||
|
class PackageJobPrivate;
|
||||||
|
|
||||||
|
class PackageJob : public KJob
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
PackageJob(const QString &servicePrefix, QObject* parent = 0);
|
||||||
|
~PackageJob();
|
||||||
|
|
||||||
|
virtual void start();
|
||||||
|
|
||||||
|
void install(const QString& src, const QString& dest);
|
||||||
|
void uninstall(const QString &installationPath);
|
||||||
|
|
||||||
|
Q_SIGNALS:
|
||||||
|
void installPathChanged(const QString &path);
|
||||||
|
|
||||||
|
// Q_SIGNALS:
|
||||||
|
// void finished(bool success);
|
||||||
|
|
||||||
|
private Q_SLOTS:
|
||||||
|
void slotFinished(bool ok, const QString &err);
|
||||||
|
|
||||||
|
private:
|
||||||
|
PackageJobPrivate* d;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
386
private/packagejobthread.cpp
Normal file
386
private/packagejobthread.cpp
Normal file
@ -0,0 +1,386 @@
|
|||||||
|
/******************************************************************************
|
||||||
|
* Copyright 2007-2009 by Aaron Seigo <aseigo@kde.org> *
|
||||||
|
* Copyright 2012 Sebastian Kügler <sebas@kde.org> *
|
||||||
|
* *
|
||||||
|
* 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 "private/packagejobthread_p.h"
|
||||||
|
|
||||||
|
|
||||||
|
#include "package.h"
|
||||||
|
#include "config-plasma.h"
|
||||||
|
|
||||||
|
#include <karchive.h>
|
||||||
|
#include <kdesktopfile.h>
|
||||||
|
#include <klocale.h>
|
||||||
|
#include <ktar.h>
|
||||||
|
#include <kzip.h>
|
||||||
|
|
||||||
|
#include <QDir>
|
||||||
|
#include <QDBusInterface>
|
||||||
|
#include <QDBusPendingCall>
|
||||||
|
#include <QFile>
|
||||||
|
#include <QIODevice>
|
||||||
|
#include <QMimeType>
|
||||||
|
#include <QMimeDatabase>
|
||||||
|
#include <QRegExp>
|
||||||
|
#include <QtNetwork/QHostInfo>
|
||||||
|
#include <qtemporarydir.h>
|
||||||
|
|
||||||
|
#include <kdebug.h>
|
||||||
|
|
||||||
|
namespace Plasma
|
||||||
|
{
|
||||||
|
|
||||||
|
bool copyFolder(QString sourcePath, QString targetPath)
|
||||||
|
{
|
||||||
|
QDir source(sourcePath);
|
||||||
|
if (!source.exists()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
QDir target(targetPath);
|
||||||
|
if (!target.exists()) {
|
||||||
|
QString targetName = target.dirName();
|
||||||
|
target.cdUp();
|
||||||
|
target.mkdir(targetName);
|
||||||
|
target = QDir(targetPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (const QString &fileName, source.entryList(QDir::Files)) {
|
||||||
|
QString sourceFilePath = sourcePath + QDir::separator() + fileName;
|
||||||
|
QString targetFilePath = targetPath + QDir::separator() + fileName;
|
||||||
|
|
||||||
|
if (!QFile::copy(sourceFilePath, targetFilePath)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (const QString &subFolderName, source.entryList(QDir::AllDirs | QDir::NoDotAndDotDot)) {
|
||||||
|
QString sourceSubFolderPath = sourcePath + QDir::separator() + subFolderName;
|
||||||
|
QString targetSubFolderPath = targetPath + QDir::separator() + subFolderName;
|
||||||
|
|
||||||
|
if (!copyFolder(sourceSubFolderPath, targetSubFolderPath)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Qt5 TODO: use QDir::removeRecursively() instead
|
||||||
|
bool removeFolder(QString folderPath)
|
||||||
|
{
|
||||||
|
QDir folder(folderPath);
|
||||||
|
if(!folder.exists())
|
||||||
|
return false;
|
||||||
|
|
||||||
|
foreach (const QString &fileName, folder.entryList(QDir::Files)) {
|
||||||
|
if (!QFile::remove(folderPath + QDir::separator() + fileName)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (const QString &subFolderName, folder.entryList(QDir::AllDirs | QDir::NoDotAndDotDot)) {
|
||||||
|
if (!removeFolder(folderPath + QDir::separator() + subFolderName)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QString folderName = folder.dirName();
|
||||||
|
folder.cdUp();
|
||||||
|
return folder.rmdir(folderName);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class PackageJobThreadPrivate {
|
||||||
|
public:
|
||||||
|
QString installPath;
|
||||||
|
QString errorMessage;
|
||||||
|
QString servicePrefix;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
PackageJobThread::PackageJobThread(const QString &servicePrefix, QObject* parent) :
|
||||||
|
QThread(parent)
|
||||||
|
{
|
||||||
|
d = new PackageJobThreadPrivate;
|
||||||
|
d->servicePrefix = servicePrefix;
|
||||||
|
}
|
||||||
|
|
||||||
|
PackageJobThread::~PackageJobThread()
|
||||||
|
{
|
||||||
|
delete d;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool PackageJobThread::install(const QString& src, const QString &dest)
|
||||||
|
{
|
||||||
|
bool ok = installPackage(src, dest);
|
||||||
|
emit installPathChanged(d->installPath);
|
||||||
|
emit finished(ok, d->errorMessage);
|
||||||
|
return ok;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool PackageJobThread::installPackage(const QString& src, const QString &dest)
|
||||||
|
{
|
||||||
|
QString packageRoot = dest;
|
||||||
|
QDir root(dest);
|
||||||
|
|
||||||
|
// FIXME: make sure package root is there.
|
||||||
|
if (!root.exists()) {
|
||||||
|
QDir().mkpath(dest);
|
||||||
|
if (!root.exists()) {
|
||||||
|
d->errorMessage = i18n("Could not create package root directory: %1", dest);
|
||||||
|
//kWarning() << "Could not create package root directory: " << dest;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QFileInfo fileInfo(src);
|
||||||
|
if (!fileInfo.exists()) {
|
||||||
|
d->errorMessage = i18n("No such file: %1", src);
|
||||||
|
//kWarning() << "No such file:" << src;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString path;
|
||||||
|
QTemporaryDir tempdir;
|
||||||
|
bool archivedPackage = false;
|
||||||
|
|
||||||
|
if (fileInfo.isDir()) {
|
||||||
|
// we have a directory, so let's just install what is in there
|
||||||
|
path = src;
|
||||||
|
|
||||||
|
// make sure we end in a slash!
|
||||||
|
if (path[path.size() - 1] != '/') {
|
||||||
|
path.append('/');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
KArchive *archive = 0;
|
||||||
|
QMimeDatabase db;
|
||||||
|
QMimeType mimetype = db.mimeTypeForFile(src);
|
||||||
|
|
||||||
|
if (mimetype.inherits("application/zip")) {
|
||||||
|
archive = new KZip(src);
|
||||||
|
} else if (mimetype.inherits("application/x-compressed-tar") ||
|
||||||
|
mimetype.inherits("application/x-tar")|| mimetype.inherits("application/x-bzip-compressed-tar") ||
|
||||||
|
mimetype.inherits("application/x-xz") || mimetype.inherits("application/x-lzma")) {
|
||||||
|
archive = new KTar(src);
|
||||||
|
} else {
|
||||||
|
//kWarning() << "Could not open package file, unsupported archive format:" << src << mimetype.name();
|
||||||
|
d->errorMessage = i18n("Could not open package file, unsupported archive format: %1 %2", src, mimetype.name());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!archive->open(QIODevice::ReadOnly)) {
|
||||||
|
//kWarning() << "Could not open package file:" << src;
|
||||||
|
delete archive;
|
||||||
|
d->errorMessage = i18n("Could not open package file: %1", src);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
archivedPackage = true;
|
||||||
|
path = tempdir.path() + '/';
|
||||||
|
|
||||||
|
//kDebug() << "path: " << path;
|
||||||
|
d->installPath = path;
|
||||||
|
|
||||||
|
const KArchiveDirectory *source = archive->directory();
|
||||||
|
source->copyTo(path);
|
||||||
|
|
||||||
|
QStringList entries = source->entries();
|
||||||
|
if (entries.count() == 1) {
|
||||||
|
const KArchiveEntry *entry = source->entry(entries[0]);
|
||||||
|
if (entry->isDirectory()) {
|
||||||
|
path.append(entry->name()).append("/");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
delete archive;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString metadataPath = path + "metadata.desktop";
|
||||||
|
if (!QFile::exists(metadataPath)) {
|
||||||
|
//kWarning() << "No metadata file in package" << src << metadataPath;
|
||||||
|
d->errorMessage = i18n("No metadata file in package: %1", src);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
KPluginInfo meta(metadataPath);
|
||||||
|
QString pluginName = meta.pluginName();
|
||||||
|
kDebug() << "pluginname: " << meta.pluginName();
|
||||||
|
if (pluginName.isEmpty()) {
|
||||||
|
//kWarning() << "Package plugin name not specified";
|
||||||
|
d->errorMessage = i18n("Package plugin name not specified: %1", src);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ensure that package names are safe so package uninstall can't inject
|
||||||
|
// bad characters into the paths used for removal.
|
||||||
|
QRegExp validatePluginName("^[\\w-\\.]+$"); // Only allow letters, numbers, underscore and period.
|
||||||
|
if (!validatePluginName.exactMatch(pluginName)) {
|
||||||
|
//kWarning() << "Package plugin name " << pluginName << "contains invalid characters";
|
||||||
|
d->errorMessage = i18n("Package plugin name %1 contains invalid characters", pluginName);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
QString targetName = dest;
|
||||||
|
if (targetName[targetName.size() - 1] != '/') {
|
||||||
|
targetName.append('/');
|
||||||
|
}
|
||||||
|
targetName.append(pluginName);
|
||||||
|
|
||||||
|
//kDebug() << " Target installation path: " << targetName;
|
||||||
|
if (QFile::exists(targetName)) {
|
||||||
|
//kWarning() << targetName << "already exists";
|
||||||
|
d->errorMessage = i18n("%1 already exists", targetName);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (archivedPackage) {
|
||||||
|
// it's in a temp dir, so just move it over.
|
||||||
|
const bool ok = copyFolder(path, targetName);
|
||||||
|
removeFolder(path);
|
||||||
|
if (!ok) {
|
||||||
|
//kWarning() << "Could not move package to destination:" << targetName;
|
||||||
|
d->errorMessage = i18n("Could not move package to destination: %1", targetName);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// it's a directory containing the stuff, so copy the contents rather
|
||||||
|
// than move them
|
||||||
|
const bool ok = copyFolder(path, targetName);
|
||||||
|
if (!ok) {
|
||||||
|
//kWarning() << "Could not copy package to destination:" << targetName;
|
||||||
|
d->errorMessage = i18n("Could not copy package to destination: %1", targetName);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (archivedPackage) {
|
||||||
|
// no need to remove the temp dir (which has been successfully moved if it's an archive)
|
||||||
|
tempdir.setAutoRemove(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!d->servicePrefix.isEmpty()) {
|
||||||
|
// and now we register it as a service =)
|
||||||
|
QString metaPath = targetName + "/metadata.desktop";
|
||||||
|
KDesktopFile df(metaPath);
|
||||||
|
KConfigGroup cg = df.desktopGroup();
|
||||||
|
|
||||||
|
// Q: should not installing it as a service disqualify it?
|
||||||
|
// Q: i don't think so since KServiceTypeTrader may not be
|
||||||
|
// used by the installing app in any case, and the
|
||||||
|
// package is properly installed - aseigo
|
||||||
|
|
||||||
|
//TODO: reduce code duplication with registerPackage below
|
||||||
|
|
||||||
|
const QString serviceName = d->servicePrefix + meta.pluginName() + ".desktop";
|
||||||
|
|
||||||
|
QString service = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/kde5/services/") + serviceName;
|
||||||
|
//kDebug() << "Copying from " << metaPath << " to " << service;
|
||||||
|
const bool ok = QFile::copy(metaPath, service);
|
||||||
|
if (ok) {
|
||||||
|
// the icon in the installed file needs to point to the icon in the
|
||||||
|
// installation dir!
|
||||||
|
QString iconPath = targetName + '/' + cg.readEntry("Icon");
|
||||||
|
QFile icon(iconPath);
|
||||||
|
if (icon.exists()) {
|
||||||
|
KDesktopFile df(service);
|
||||||
|
KConfigGroup cg = df.desktopGroup();
|
||||||
|
cg.writeEntry("Icon", iconPath);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
//kWarning() << "Could not register package as service (this is not necessarily fatal):" << serviceName;
|
||||||
|
d->errorMessage = i18n("Could not register package as service (this is not necessarily fatal): %1", serviceName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
QDBusInterface sycoca("org.kde.kded5", "/kbuildsycoca");
|
||||||
|
sycoca.asyncCall("recreate");
|
||||||
|
*/
|
||||||
|
d->installPath = targetName;
|
||||||
|
|
||||||
|
//kWarning() << "Not updating kbuildsycoca4, since that will go away. Do it yourself for now if needed.";
|
||||||
|
return true;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
bool PackageJobThread::uninstall(const QString &packagePath)
|
||||||
|
{
|
||||||
|
bool ok = uninstallPackage(packagePath);
|
||||||
|
//kDebug() << "emit installPathChanged " << d->installPath;
|
||||||
|
emit installPathChanged(QString());
|
||||||
|
//kDebug() << "Thread: installFinished" << ok;
|
||||||
|
emit finished(ok, d->errorMessage);
|
||||||
|
return ok;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool PackageJobThread::uninstallPackage(const QString& packagePath)
|
||||||
|
{
|
||||||
|
// We need to remove the package directory and its metadata file.
|
||||||
|
const QString targetName = packagePath; // FIXME : remove
|
||||||
|
|
||||||
|
if (!QFile::exists(targetName)) {
|
||||||
|
kWarning() << targetName << "does not exist";
|
||||||
|
return false; // FIXME: KJob!
|
||||||
|
}
|
||||||
|
QString pkg;
|
||||||
|
{ // FIXME: remove, pass in packageroot, type and pluginName separately?
|
||||||
|
QString _path = packagePath;
|
||||||
|
QStringList ps = packagePath.split('/');
|
||||||
|
int ix = ps.count()-1;
|
||||||
|
if (packagePath.endsWith('/')) {
|
||||||
|
ix = ps.count()-2;
|
||||||
|
}
|
||||||
|
//kDebug() << " PJT: split: " << pkg << ps;
|
||||||
|
pkg = ps[ix];
|
||||||
|
kDebug() << " PJT: split: " << pkg << ps;
|
||||||
|
|
||||||
|
}
|
||||||
|
const QString &packageName = pkg;
|
||||||
|
|
||||||
|
const QString serviceName = d->servicePrefix + packageName + ".desktop";
|
||||||
|
|
||||||
|
QString service = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/kde5/services/") + serviceName;
|
||||||
|
#ifndef NDEBUG
|
||||||
|
kDebug() << "Removing service file " << service;
|
||||||
|
#endif
|
||||||
|
bool ok = QFile::remove(service);
|
||||||
|
|
||||||
|
if (!ok) {
|
||||||
|
kWarning() << "Unable to remove " << service;
|
||||||
|
}
|
||||||
|
|
||||||
|
ok = removeFolder(targetName);
|
||||||
|
if (!ok) {
|
||||||
|
d->errorMessage = i18n("Could not delete package from: %1", targetName);
|
||||||
|
return false; // FIXME: KJob!
|
||||||
|
}
|
||||||
|
|
||||||
|
// QDBusInterface sycoca("org.kde.kded5", "/kbuildsycoca");
|
||||||
|
// sycoca.asyncCall("recreate");
|
||||||
|
return true; // FIXME: KJob!
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
} // namespace Plasma
|
||||||
|
|
||||||
|
#include "moc_packagejobthread_p.cpp"
|
||||||
|
|
57
private/packagejobthread_p.h
Normal file
57
private/packagejobthread_p.h
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
/******************************************************************************
|
||||||
|
* Copyright 2007-2009 by Aaron Seigo <aseigo@kde.org> *
|
||||||
|
* Copyright 2012 Sebastian Kügler <sebas@kde.org> *
|
||||||
|
* *
|
||||||
|
* 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. *
|
||||||
|
*******************************************************************************/
|
||||||
|
|
||||||
|
#ifndef PLASMA_PACKAGEJOBTHREAD_P_H
|
||||||
|
#define PLASMA_PACKAGEJOBTHREAD_P_H
|
||||||
|
|
||||||
|
#include "kjob.h"
|
||||||
|
#include <QThread>
|
||||||
|
|
||||||
|
namespace Plasma
|
||||||
|
{
|
||||||
|
|
||||||
|
class PackageJobThreadPrivate;
|
||||||
|
|
||||||
|
class PackageJobThread : public QThread
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
PackageJobThread(const QString &servicePrefix, QObject* parent = 0);
|
||||||
|
virtual ~PackageJobThread();
|
||||||
|
|
||||||
|
bool install(const QString &src, const QString &dest);
|
||||||
|
bool uninstall(const QString &packagePath);
|
||||||
|
|
||||||
|
Q_SIGNALS:
|
||||||
|
void finished(bool success, const QString &errorMessage = QString());
|
||||||
|
void percentChanged(int percent);
|
||||||
|
void error(const QString &errorMessage);
|
||||||
|
void installPathChanged(const QString &installPath);
|
||||||
|
|
||||||
|
private:
|
||||||
|
bool installPackage(const QString &src, const QString &dest);
|
||||||
|
bool uninstallPackage(const QString &packagePath);
|
||||||
|
PackageJobThreadPrivate* d;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in New Issue
Block a user