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

Deal properly with symlinks in path to packages

Browse Source 
We receive the URL with all symlinks resolved, but internally the
pkgRoot kept unresolved symlinks preventing matches if there was a
symlink somewhere to get to the package.

REVIEW: 126562
This commit is contained in:
Kevin Ottens 2015-12-29 16:04:04 +01:00
parent d85c02b5bb
commit 46c555838c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plasmaquick/packageurlinterceptor.cpp
View File

@ -22,6 +22,7 @@
#include <QDebug>
#include <QQmlEngine>
#include <QFile>
#include <QFileInfo>
#include <QStandardPaths>
#include <Plasma/PluginLoader>
@ -87,9 +88,9 @@ QUrl PackageUrlInterceptor::intercept(const QUrl &path, QQmlAbstractUrlIntercept
package = d->package;
} else {
foreach (const QString &base, QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation)) {
pkgRoot = base + "/plasma/plasmoids/";
if (path.path().startsWith(pkgRoot)) {
const QString pkgName = path.path().mid(pkgRoot.length()).split('/').first();
pkgRoot = QFileInfo(base + "/plasma/plasmoids/").canonicalFilePath();
if (!pkgRoot.isEmpty() && path.path().startsWith(pkgRoot)) {
const QString pkgName = path.path().mid(pkgRoot.length() + 1).split('/').first();
if (PackageUrlInterceptorPrivate::s_packages.contains(pkgName)) {
package = PackageUrlInterceptorPrivate::s_packages.value(pkgName);
} else {