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

tidy up the data engine plugin loading code

Browse Source
This commit is contained in:
Aaron Seigo 2014-08-29 11:49:24 +02:00
parent 67cab00bf3
commit aa99a4f15c
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/plasma/pluginloader.cpp
View File

@ -51,7 +51,9 @@ class PluginLoaderPrivate
{ {
public: public:
PluginLoaderPrivate() PluginLoaderPrivate()
: packageRE("[^a-zA-Z0-9\\-_]") : isDefaultLoader(false),
dataEnginePluginDir("plasma/dataengine"),
packageRE("[^a-zA-Z0-9\\-_]")
{ {
} }
@ -61,7 +63,7 @@ public:
static QSet<QString> s_customCategories; static QSet<QString> s_customCategories;
QHash<QString, QWeakPointer<PackageStructure> > structures; QHash<QString, QWeakPointer<PackageStructure> > structures;
bool isDefaultLoader; bool isDefaultLoader;
QString pluginDir; QString dataEnginePluginDir;
QRegExp packageRE; QRegExp packageRE;
}; };
@ -113,8 +115,6 @@ QString PluginLoaderPrivate::parentAppConstraint(const QString &parentApp)
PluginLoader::PluginLoader() PluginLoader::PluginLoader()
: d(new PluginLoaderPrivate) : d(new PluginLoaderPrivate)
{ {
d->pluginDir = "plasma/dataengine";
d->isDefaultLoader = false;
} }
PluginLoader::~PluginLoader() PluginLoader::~PluginLoader()
@ -236,33 +236,22 @@ DataEngine *PluginLoader::loadDataEngine(const QString &name)
return engine; return engine;
} }
// load the engine, add it to the engines
QString constraint = QString("[X-KDE-PluginInfo-Name] == '%1'").arg(name); QString constraint = QString("[X-KDE-PluginInfo-Name] == '%1'").arg(name);
KService::List offers = KServiceTypeTrader::self()->query("Plasma/DataEngine",
constraint);
QString error;
if (offers.isEmpty()) { // First check with KServiceTypeTrader as that is where scripted engines will be
#ifndef NDEBUG KService::List offers = KServiceTypeTrader::self()->query("Plasma/DataEngine", constraint);
// qDebug() << "offers are empty for " << name << " with constraint " << constraint;
#endif if (!offers.isEmpty()) {
} else { const QString api = offers.first()->property("X-Plasma-API").toString();
QVariantList allArgs;
allArgs << offers.first()->storageId();
QString api = offers.first()->property("X-Plasma-API").toString();
if (api.isEmpty()) { if (api.isEmpty()) {
engine = KPluginTrader::createInstanceFromQuery<Plasma::DataEngine>(d->pluginDir, "Plasma/DataEngine", constraint, 0); // it is a C++ plugin, fetch it with KPluginTrader
engine = KPluginTrader::createInstanceFromQuery<Plasma::DataEngine>(d->dataEnginePluginDir, "Plasma/DataEngine", constraint, 0);
} else { } else {
// it is a scripted plugin, load it via a package
engine = new DataEngine(KPluginInfo(offers.first()), 0); engine = new DataEngine(KPluginInfo(offers.first()), 0);
} }
} }
if (!engine) {
#ifndef NDEBUG
// qDebug() << "Couldn't load engine \"" << name << "\". Error given: " << error;
#endif
}
return engine; return engine;
} }
@ -695,7 +684,7 @@ KPluginInfo::List PluginLoader::listDataEngineInfo(const QString &parentApp)
constraint.append("[X-KDE-ParentApp] == '").append(parentApp).append("'"); constraint.append("[X-KDE-ParentApp] == '").append(parentApp).append("'");
} }
list.append(KPluginTrader::self()->query(d->pluginDir, "Plasma/DataEngine", constraint)); list.append(KPluginTrader::self()->query(d->dataEnginePluginDir, "Plasma/DataEngine", constraint));
return list; return list;
} }