Fix after rebasing.

Author: Holt59

src/mobase/wrappers/basic_classes.cpp

@@ -5,6 +5,8 @@
 #include <format>
 
 #include <uibase/executableinfo.h>
+#include <uibase/extensions/extension.h>
+#include <uibase/extensions/iextensionlist.h>
 #include <uibase/filemapping.h>
 #include <uibase/game_features/igamefeatures.h>
 #include <uibase/guessedvalue.h>
@@ -590,6 +592,8 @@ namespace mo2::python {
                  py::return_value_policy::reference)
             .def("pluginList", &IOrganizer::pluginList,
                  py::return_value_policy::reference)
+            .def("extensionList", &IOrganizer::extensionList,
+                 py::return_value_policy::reference)
             .def("modList", &IOrganizer::modList, py::return_value_policy::reference)
             .def("gameFeatures", &IOrganizer::gameFeatures,
                  py::return_value_policy::reference)

src/mobase/wrappers/pyplugins.cpp

@@ -144,11 +144,6 @@ namespace mo2::python {
             .def("init", &IPlugin::init, "organizer"_a)
             .def("name", &IPlugin::name)
             .def("localizedName", &IPlugin::localizedName)
-            .def("master", &IPlugin::master)
-            .def("author", &IPlugin::author)
-            .def("description", &IPlugin::description)
-            .def("version", &IPlugin::version)
-            .def("requirements", &IPlugin::requirements)
             .def("settings", &IPlugin::settings)
             .def("enabledByDefault", &IPlugin::enabledByDefault);
 

src/mobase/wrappers/pyplugins.h

@@ -45,22 +45,6 @@ namespace mo2::python {
         {
             PYBIND11_OVERRIDE(QString, PluginBase, localizedName, );
         }
-        QString master() const override
-        {
-            PYBIND11_OVERRIDE(QString, PluginBase, master, );
-        }
-        QString author() const override
-        {
-            PYBIND11_OVERRIDE_PURE(QString, PluginBase, author, );
-        }
-        QString description() const override
-        {
-            PYBIND11_OVERRIDE_PURE(QString, PluginBase, description, );
-        }
-        VersionInfo version() const override
-        {
-            PYBIND11_OVERRIDE_PURE(VersionInfo, PluginBase, version, );
-        }
         QList<PluginSetting> settings() const override
         {
             PYBIND11_OVERRIDE_PURE(QList<PluginSetting>, PluginBase, settings, );

src/plugin_python_en.ts

@@ -4,35 +4,35 @@
 <context>
     <name>ProxyPython</name>
     <message>
-        <location filename="proxy/proxypython.cpp" line="156"/>
-        <source>The path to Mod Organizer (%1) contains a semicolon. &lt;br&gt;While this is legal on NTFS drives, many softwares do not handle it correctly.&lt;br&gt;Unfortunately MO depends on libraries that seem to fall into that group.&lt;br&gt;As a result the python plugin cannot be loaded, and the only solution we canoffer is to remove the semicolon or move MO to a path without a semicolon.</source>
+        <location filename="proxy/proxypython.cpp" line="170"/>
+        <source>The path to Mod Organizer (%1) contains a semicolon.&lt;br&gt;While this is legal on NTFS drives, many applications do not handle it correctly.&lt;br&gt;Unfortunately MO depends on libraries that seem to fall into that group.&lt;br&gt;As a result the python plugin cannot be loaded, and the only solution we can offer is to remove the semicolon or move MO to a path without a semicolon.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="proxy/proxypython.cpp" line="167"/>
+        <location filename="proxy/proxypython.cpp" line="180"/>
         <source>The Python plugin DLL was not found, maybe your antivirus deleted it. Re-installing MO2 might fix the problem.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="proxy/proxypython.cpp" line="170"/>
+        <location filename="proxy/proxypython.cpp" line="183"/>
         <source>The Python plugin DLL is invalid, maybe your antivirus is blocking it. Re-installing MO2 and adding exclusions for it to your AV might fix the problem.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="proxy/proxypython.cpp" line="174"/>
+        <location filename="proxy/proxypython.cpp" line="188"/>
         <source>The initialization of the Python plugin DLL failed, unfortunately without any details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="proxy/proxypython.cpp" line="177"/>
+        <location filename="proxy/proxypython.cpp" line="191"/>
         <source>no failure</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="runner/error.h" line="77"/>
+        <location filename="runner/error.h" line="76"/>
         <source>An unknown exception was thrown in python code.</source>
         <translation type="unfinished"></translation>
     </message>

src/proxy/CMakeLists.txt

@@ -9,7 +9,7 @@ mo2_configure_plugin(proxy
     NO_SOURCES
     WARNINGS 4
     EXTERNAL_WARNINGS 4
-    TRANSLATIONS ON
+    TRANSLATIONS OFF
     EXTRA_TRANSLATIONS
     ${CMAKE_CURRENT_SOURCE_DIR}/../runner
     ${CMAKE_CURRENT_SOURCE_DIR}/../mobase
@@ -21,8 +21,8 @@ set_target_properties(proxy PROPERTIES OUTPUT_NAME "python_proxy")
 set(PROXY_PYTHON_DIR ${MO2_INSTALL_BIN}/proxies/python)
 
 # install runner and proxy
-install(FILES $<TARGET_FILE:proxy> DESTINATION ${PROXY_PYTHON_DIR}/python)
-install(FILES $<TARGET_FILE:runner> DESTINATION ${PROXY_PYTHON_DIR}/python/dlls)
+install(FILES $<TARGET_FILE:proxy> DESTINATION ${PROXY_PYTHON_DIR})
+install(FILES $<TARGET_FILE:runner> DESTINATION ${PROXY_PYTHON_DIR}/dlls)
 
 # install PDB
 install(FILES $<TARGET_PDB_FILE:proxy> DESTINATION pdb)
@@ -32,7 +32,7 @@ target_link_options(proxy PRIVATE "/DELAYLOAD:runner.dll")
 
 # translations (custom location)
 mo2_add_translations(proxy
-    TS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../${PLUGIN_NAME}_en.ts
+    TS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../plugin_python_en.ts
     SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../runner

src/runner/pythonrunner.h

@@ -9,7 +9,7 @@
 #include <QString>
 #include <QStringList>
 
-#include <extension.h>
+#include <uibase/extensions/extension.h>
 
 #ifdef RUNNER_BUILD
 #define RUNNER_DLL_EXPORT Q_DECL_EXPORT

tests/mocks/MockOrganizer.h

@@ -35,6 +35,7 @@ class MockOrganizer : public IOrganizer {
 	MOCK_METHOD(std::shared_ptr<const IFileTree>, virtualFileTree, (), (const, override));
 	MOCK_METHOD(MOBase::IDownloadManager*, downloadManager, (), (const, override));
 	MOCK_METHOD(MOBase::IPluginList*, pluginList, (), (const, override));
+	MOCK_METHOD(MOBase::IExtensionList&, extensionList, (), (const, override));
 	MOCK_METHOD(MOBase::IModList*, modList, (), (const, override));
 	MOCK_METHOD(MOBase::IProfile*, profile, (), (const, override));
 	MOCK_METHOD(MOBase::IGameFeatures*, gameFeatures, (), (const, override));

tests/runner/test_iplugin.cpp

@@ -26,10 +26,7 @@ TEST(IPlugin, Basic)
     const IPlugin* plugin = qobject_cast<IPlugin*>(objects[0][0]);
     EXPECT_NE(plugin, nullptr);
 
-    EXPECT_EQ(plugin->author(), "The Author");
     EXPECT_EQ(plugin->name(), "The Name");
-    EXPECT_EQ(plugin->version(), VersionInfo(1, 3, 0));
-    EXPECT_EQ(plugin->description(), "The Description");
 
     // settings
     const auto settings = plugin->settings();