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

[PackageUrlInterceptor] Minor code optimisation

Browse Source 
This gets rid of QRegularExpression and uses plain string operations,
which is always a faster route.
This commit is contained in:
Ahmad Samir 2020-05-22 12:44:42 +00:00 committed by Nate Graham
parent 1636b566bd
commit e63b2092d0
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/plasmaquick/packageurlinterceptor.cpp
View File

@ -25,7 +25,6 @@
#include <QFileInfo> #include <QFileInfo>
#include <QFileSelector> #include <QFileSelector>
#include <QStandardPaths> #include <QStandardPaths>
#include <QRegularExpression>
#include <Plasma/PluginLoader> #include <Plasma/PluginLoader>
#include <Plasma/Package> #include <Plasma/Package>
@ -102,34 +101,38 @@ QUrl PackageUrlInterceptor::intercept(const QUrl &path, QQmlAbstractUrlIntercept
{ {
//qDebug() << "Intercepted URL:" << path << type; //qDebug() << "Intercepted URL:" << path << type;
const QString urlPath = path.path();
// Don't intercept qmldir files, to prevent double interception // Don't intercept qmldir files, to prevent double interception
if (path.path().endsWith(QStringLiteral("qmldir"))) { if (urlPath.endsWith(QLatin1String("qmldir"))) {
return path; return path;
} }
// We assume we never rewritten qml/qmldir files // We assume we never rewritten qml/qmldir files
if (path.path().endsWith(QLatin1String("qml")) if (urlPath.endsWith(QLatin1String("qml"))
|| path.path().endsWith(QLatin1String("/inline"))) { || urlPath.endsWith(QLatin1String("/inline"))) {
return d->selector->select(path); return d->selector->select(path);
} }
const QString prefix = QString::fromUtf8(prefixForType(type, path.path())); const QString prefix = QString::fromUtf8(prefixForType(type, urlPath));
QRegularExpression match(QStringLiteral("/ui/(.*)"));
// TODO KF6: Kill this hack // TODO KF6: Kill this hack
const QLatin1String marker("/ui/");
QString plainPath = path.toString(); QString plainPath = path.toString();
if (plainPath.contains(match)) { const int index = plainPath.indexOf(marker);
QString rewritten = plainPath.replace(match, QStringLiteral("/%1/\\1").arg(prefix)); if (index != -1) {
plainPath = plainPath.leftRef(index)
+ QLatin1Char('/') + prefix + QLatin1Char('/') + plainPath.midRef(index + marker.size());
const QUrl url = QUrl(plainPath);
const QString newPath = url.path();
//search it in a resource or as a file on disk //search it in a resource or as a file on disk
if (!(rewritten.contains(QLatin1String("qrc")) && if (!(plainPath.contains(QLatin1String("qrc")) && QFile::exists(QLatin1Char(':') + newPath))
QFile::exists(QStringLiteral(":") + QUrl(rewritten).path())) && && !QFile::exists(newPath)) {
!QFile::exists(QUrl(rewritten).path())) {
return d->selector->select(path); return d->selector->select(path);
} }
qWarning()<<"Warning: all files used by qml by the plasmoid should be in ui/. The file in the path" << rewritten << "was expected at" <<path; qWarning() <<"Warning: all files used by qml by the plasmoid should be in ui/. The file in the path"
<< plainPath << "was expected at" << path;
// This deprecated code path doesn't support selectors // This deprecated code path doesn't support selectors
return QUrl(rewritten); return url;
} }
return d->selector->select(path); return d->selector->select(path);
} }
} }