alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Catch packages zipped into subdirectory

Browse Source 
This is a pretty common thing, as most zipping tools put the contents
into a subdirectory by default.

Fixes theme package installation.
This commit is contained in:
Sebastian Kügler 2014-02-02 02:18:54 +01:00
parent 833c2f55dd
commit fa7ae03867
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/plasma/package.cpp
View File

@ -233,7 +233,8 @@ KPluginInfo Package::metadata() const
return *d->metadata; return *d->metadata;
} }
QString PackagePrivate::unpack(const QString& filePath) { QString PackagePrivate::unpack(const QString& filePath)
{
KArchive *archive = 0; KArchive *archive = 0;
QMimeDatabase db; QMimeDatabase db;
QMimeType mimeType = db.mimeTypeForFile(filePath); QMimeType mimeType = db.mimeTypeForFile(filePath);
@ -252,9 +253,20 @@ QString PackagePrivate::unpack(const QString& filePath) {
const KArchiveDirectory *source = archive->directory(); const KArchiveDirectory *source = archive->directory();
QTemporaryDir tempdir; QTemporaryDir tempdir;
tempdir.setAutoRemove(false); tempdir.setAutoRemove(false);
source->copyTo(tempdir.path() + '/');
createPackageMetadata(tempdir.path() + '/');
tempRoot = tempdir.path() + '/'; tempRoot = tempdir.path() + '/';
source->copyTo(tempRoot);
// search metadata.desktop, the zip file might have the package contents in a subdirectory
QDir unpackedPath(tempdir.path());
const QStringList &entries = unpackedPath.entryList(QDir::Dirs);
foreach (const QString pack, entries) {
if ((pack != "." && pack != "..") &&
(QFile::exists(unpackedPath.absolutePath()+'/'+pack+"/metadata.desktop"))) {
tempRoot = unpackedPath.absolutePath()+'/'+pack+'/';
}
}
createPackageMetadata(tempRoot);
} else { } else {
qWarning() << "Could not open package file:" << path; qWarning() << "Could not open package file:" << path;
} }
@ -448,10 +460,9 @@ void Package::setPath(const QString &path)
paths << path; paths << path;
} }
} }
QFileInfo fileInfo(path);
QFileInfo fileInfo(path);
if (fileInfo.isFile() && d->tempRoot.isEmpty()) { if (fileInfo.isFile() && d->tempRoot.isEmpty()) {
//qDebug() << "before unzip: path " << path;
d->path = path; d->path = path;
d->tempRoot = d->unpack(path); d->tempRoot = d->unpack(path);
} }
@ -822,7 +833,6 @@ void PackagePrivate::updateHash(const QString &basePath, const QString &subPath,
void PackagePrivate::createPackageMetadata(const QString &path) void PackagePrivate::createPackageMetadata(const QString &path)
{ {
delete metadata; delete metadata;
QString metadataPath(path + "/metadata.desktop"); QString metadataPath(path + "/metadata.desktop");
if (!QFile::exists(metadataPath)) { if (!QFile::exists(metadataPath)) {
qWarning() << "No metadata file in the package, expected it at:" << metadataPath; qWarning() << "No metadata file in the package, expected it at:" << metadataPath;