extended api

Skycoder42 · Skycoder42 · commit 84fc433ffed1 · 2017-12-30T00:20:48.000+01:00
diff --git a/qpluginfactory.cpp b/qpluginfactory.cpp
@@ -27,6 +27,8 @@ class DynamicPluginInfo : public QPluginFactoryBase::PluginInfo
 	QJsonObject metaData() const override;
 	QObject *instance() override;
 
+	QPluginLoader *loader() const;
+
 private:
 	QScopedPointer<QPluginLoader, QScopedPointerDeleteLater> _loader;
 };
@@ -142,10 +144,14 @@ void QPluginFactoryBase::reloadPlugins()
 			QScopedPointer<QPluginLoader, QScopedPointerDeleteLater> loader(new QPluginLoader(info.absoluteFilePath()));
 			auto metaData = loader->metaData();
 			auto keys = checkMeta(metaData, loader->fileName());
+			if(keys.isEmpty())
+				continue;
+
+			auto dynInfo = QSharedPointer<DynamicPluginInfo>::create(loader);
 			foreach(auto key, keys) {
 				auto k = key.toString();
 				if(!_plugins.contains(k))
-					_plugins.insert(k, QSharedPointer<DynamicPluginInfo>::create(loader));
+					_plugins.insert(k, dynInfo);
 				oldKeys.removeOne(k);
 			}
 		}
@@ -167,6 +173,36 @@ void QPluginFactoryBase::reloadPlugins()
 		_plugins.remove(key);
 }
 
+bool QPluginFactoryBase::isLoaded(const QString &key) const
+{
+	QMutexLocker _(&_loaderMutex);
+	auto info = _plugins.value(key);
+	if(info) {
+		auto dynInfo = info.dynamicCast<DynamicPluginInfo>();
+		if(dynInfo)
+			return dynInfo->loader()->isLoaded();
+		else //static plugin
+			return true;
+	} else
+		return false;
+}
+
+void QPluginFactoryBase::unload(const QString &key)
+{
+	QMutexLocker _(&_loaderMutex);
+	auto info = _plugins.value(key);
+	if(info) {
+		auto dynInfo = info.dynamicCast<DynamicPluginInfo>();
+		if(dynInfo) {
+			auto loader = dynInfo->loader();
+			if(loader->isLoaded()){
+				if(!loader->unload())
+					qWarning().noquote() << "Failed to unload plugin for key" << key << "with error:" << loader->errorString();
+			}
+		}
+	}
+}
+
 QJsonArray QPluginFactoryBase::checkMeta(const QJsonObject &metaData, const QString &filename) const
 {
 	if(metaData[QStringLiteral("debug")].toBool() != __qpluginfactory_is_debug())
@@ -250,3 +286,8 @@ QObject *DynamicPluginInfo::instance()
 		throw QPluginLoadException(_loader.data());
 	return _loader->instance();
 }
+
+QPluginLoader *DynamicPluginInfo::loader() const
+{
+	return _loader.data();
+}
diff --git a/qpluginfactory.h b/qpluginfactory.h
@@ -53,6 +53,10 @@ public slots:
 
 	void reloadPlugins();
 
+protected:
+	bool isLoaded(const QString &key) const;
+	void unload(const QString &key);
+
 private:
 	const QString _pluginType;
 	QByteArray _pluginIid;
