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

Fix loading plugininfo from file

Browse Source 
Remove trailing slash from the path as it might point to a file, in
which case the file info lookup will fail.
This commit is contained in:
Sebastian Kügler 2013-02-18 04:08:00 +01:00
parent b15f6baebd
commit bbf7e910ec
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plasma/package.cpp
View File

@ -201,14 +201,21 @@ KPluginInfo Package::metadata() const
if (!metadataPath.isEmpty()) {
d->createPackageMetadata(metadataPath);
} else {
QFileInfo fileInfo(d->path);
// d->path might still be a file, if its path has a trailing /,
// the fileInfo lookup will fail, so remove it.
QString p = d->path;
if (d->path.endsWith("/")) {
p = p.remove(p.count()-1, 1);
}
d->path = p;
QFileInfo fileInfo(p);
if (fileInfo.isDir()) {
d->createPackageMetadata(d->path);
} else if (fileInfo.exists()) {
KArchive *archive = 0;
QMimeDatabase db;
QMimeType mimeType = db.mimeTypeForFile(d->path);
QMimeType mimeType = db.mimeTypeForFile(p);
if (mimeType.inherits("application/zip")) {
archive = new KZip(d->path);