Update for extensions.

Author: Holt59

src/CMakeLists.txt

@@ -14,6 +14,7 @@ mo2_add_filter(NAME src/extensions GROUPS
 	extension
 	theme
 	translation
+	ipluginloader
 )
 
 mo2_add_filter(NAME src/interfaces GROUPS
@@ -30,7 +31,6 @@ mo2_add_filter(NAME src/interfaces GROUPS
 	ipluginlist
 	ipluginmodpage
 	ipluginpreview
-	ipluginproxy
 	iplugintool
 	iprofile
 	isavegame

src/extension.cpp

@@ -114,7 +114,9 @@ ExtensionFactory::loadExtension(std::filesystem::path directory,
     return TranslationExtension::loadExtension(std::move(directory),
                                                std::move(metadata));
   case ExtensionType::PLUGIN:
+    return PluginExtension::loadExtension(std::move(directory), std::move(metadata));
   case ExtensionType::GAME:
+    return GameExtension::loadExtension(std::move(directory), std::move(metadata));
   case ExtensionType::INVALID:
   default:
     log::warn("failed to load extension from '{}': invalid type", directory.native());
@@ -197,7 +199,6 @@ TranslationExtension::loadExtension(std::filesystem::path path,
       new TranslationExtension(path, metadata, std::move(translations))};
 }
 
-#pragma optimize("", off)
 std::shared_ptr<const Translation>
 TranslationExtension::parseTranslation(std::filesystem::path const& extensionFolder,
                                        const QString& identifier,
@@ -227,6 +228,36 @@ TranslationExtension::parseTranslation(std::filesystem::path const& extensionFol
   return std::make_shared<Translation>(identifier.toStdString(), name.toStdString(),
                                        std::move(qm_files));
 }
-#pragma optimize("", on)
+
+PluginExtension::PluginExtension(
+    std::filesystem::path path, ExtensionMetaData metadata, bool autodetect,
+    std::vector<std::filesystem::path> plugins,
+    std::vector<std::shared_ptr<const ThemeAddition>> themeAdditions,
+    std::vector<std::shared_ptr<const TranslationAddition>> translationAdditions)
+    : IExtension(std::move(path), std::move(metadata)), m_AutoDetect{autodetect},
+      m_Plugins{std::move(plugins)}, m_ThemeAdditions{std::move(themeAdditions)},
+      m_TranslationAdditions{std::move(translationAdditions)}
+{}
+
+std::unique_ptr<PluginExtension>
+PluginExtension::loadExtension(std::filesystem::path path, ExtensionMetaData metadata)
+{
+  // TODO
+  return std::unique_ptr<PluginExtension>(
+      new PluginExtension(std::move(path), std::move(metadata), true, {}, {}, {}));
+}
+
+GameExtension::GameExtension(PluginExtension&& pluginExtension)
+    : PluginExtension(std::move(pluginExtension))
+{}
+
+std::unique_ptr<GameExtension> GameExtension::loadExtension(std::filesystem::path path,
+                                                            ExtensionMetaData metadata)
+{
+  auto extension = PluginExtension::loadExtension(std::move(path), std::move(metadata));
+  return extension
+             ? std::unique_ptr<GameExtension>(new GameExtension(std::move(*extension)))
+             : nullptr;
+}
 
 }  // namespace MOBase

src/extension.h

@@ -217,6 +217,17 @@ class QDLLEXPORT PluginExtension : public IExtension
   const auto& themeAdditions() const { return m_ThemeAdditions; }
   const auto& translationAdditions() const { return m_TranslationAdditions; }
 
+protected:
+  PluginExtension(
+      std::filesystem::path path, ExtensionMetaData metadata, bool autodetect,
+      std::vector<std::filesystem::path> plugins,
+      std::vector<std::shared_ptr<const ThemeAddition>> themeAdditions,
+      std::vector<std::shared_ptr<const TranslationAddition>> translationAdditions);
+
+  friend class ExtensionFactory;
+  static std::unique_ptr<PluginExtension> loadExtension(std::filesystem::path path,
+                                                        ExtensionMetaData metadata);
+
 private:
   // auto-detect plugins
   bool m_AutoDetect;
@@ -234,8 +245,12 @@ class QDLLEXPORT PluginExtension : public IExtension
 //
 class QDLLEXPORT GameExtension : public PluginExtension
 {
-public:
-  using PluginExtension::PluginExtension;
+private:
+  GameExtension(PluginExtension&& pluginExtension);
+
+  friend class ExtensionFactory;
+  static std::unique_ptr<GameExtension> loadExtension(std::filesystem::path path,
+                                                      ExtensionMetaData metadata);
 };
 
 }  // namespace MOBase

src/ipluginloader.h

@@ -0,0 +1,65 @@
+/*
+Mod Organizer shared UI functionality
+
+Copyright (C) 2012 Sebastian Herbord. All rights reserved.
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 3 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef IPLUGINPROXY_H
+#define IPLUGINPROXY_H
+
+#include <QDir>
+#include <QList>
+#include <QString>
+
+#include "extension.h"
+
+namespace MOBase
+{
+
+class IPluginLoader : public QObject
+{
+public:
+  // initialize the loader, set the error message on failure
+  //
+  virtual bool initialize(QString& errorMessage) = 0;
+
+  // extract and load plugins from the given extension
+  //
+  // if multiple QObject* corresponds to the same Plugin, they should be returned
+  // together
+  //
+  virtual QList<QList<QObject*>> load(const PluginExtension& extension) = 0;
+
+  // unload plugins from the given extension
+  //
+  virtual void unload(const PluginExtension& identifier) = 0;
+
+  // unload all plugins from this loader
+  //
+  virtual void unloadAll() = 0;
+
+  virtual ~IPluginLoader() {}
+
+protected:
+  IPluginLoader() {}
+};
+
+}  // namespace MOBase
+
+Q_DECLARE_INTERFACE(MOBase::IPluginLoader, "com.mo2.PluginLoader")
+
+#endif  // IPLUGINPROXY_H

src/ipluginproxy.h

@@ -412,6 +412,11 @@ std::string converter<QVariant>::convert(const QVariant& v)
                           : v.toString().toStdString()));
 }
 
+std::string converter<std::filesystem::path>::convert(const std::filesystem::path& v)
+{
+  return v.string();
+}
+
 void doLogImpl(spdlog::logger& lg, Levels lv, const std::string& s) noexcept
 {
   try {

src/log.cpp

@@ -108,6 +108,12 @@ struct QDLLEXPORT converter<QVariant>
   static std::string convert(const QVariant& v);
 };
 
+template <>
+struct QDLLEXPORT converter<std::filesystem::path>
+{
+  static std::string convert(const std::filesystem::path& v);
+};
+
 // custom converter for enum and enum class that seems to not work with latest fmt
 template <typename T>
 struct QDLLEXPORT converter<T, std::enable_if_t<std::is_enum_v<T>>>