Small fix to shut up messages about long boost names

suggesting a name and retrieve a list of all installed mods

src/proxy/SConscript

@@ -0,0 +1,32 @@
+import os
+
+Import('qt_env')
+
+env = qt_env.Clone()
+
+env.AppendUnique(CPPDEFINES = [
+    'PROXYPYTHON_LIBRARY',
+    # suppress a few warnings caused by boost vs vc++ paranoia
+    '_SCL_SECURE_NO_WARNINGS'
+])
+
+env.AppendUnique(CPPPATH = [
+    '${BOOSTPATH}',
+    '..\\..\\pythonRunner'
+])
+
+env.AppendUnique(LIBS = 'shell32')
+
+runner = env.File(os.path.join('..', '..', 'pythonRunner', 'pythonRunner.dll'))
+
+runner_env = env.Clone()
+runner_env.AppendUnique(CPPDEFINES = 'SCONS_BUILD')
+runner_env.AppendUnique(CPPPATH = runner.dir)
+
+# There's a whole load of unused C++ files in here.
+lib = env.SharedLibrary('proxyPython', [ 'proxypython.cpp' ])
+
+env.InstallModule(lib)
+
+res = env['QT_USED_MODULES']
+Return('res')

src/proxy/embedrunner.rc

@@ -1,7 +1,11 @@
 #include "resource.h"
 
+#ifdef SCONS_BUILD
+IDR_LOADER_DLL        BINARY  MOVEABLE PURE   pythonRunner.dll
+#else
 #ifdef _DEBUG
 IDR_LOADER_DLL        BINARY  MOVEABLE PURE   "..\\..\\pythonRunner\\debug\\pythonRunner.dll"
 #else // _DEBUG
 IDR_LOADER_DLL        BINARY  MOVEABLE PURE   "..\\..\\pythonRunner\\release\\pythonRunner.dll"
 #endif // _DEBUG
+#endif

src/proxy/proxyPython.pro

@@ -29,10 +29,9 @@ HEADERS += proxypython.h \
 
 OTHER_FILES += \
     proxypython.json \
-    embedrunner.rc
+    SConscript
 
-RC_FILE += \
-    embedrunner.rc
+RC_FILE +=
 
 include(../plugin_template.pri)
 

src/proxy/proxypython.cpp

@@ -60,13 +60,31 @@ QString ExtractResource(WORD resourceID, const QString &szFilename)
   }
 
   LPVOID lpFile = LockResource(hFileResource);
+  if (lpFile == nullptr) {
+    throw MyException(QString("failed to lock resource: %1").arg(windowsErrorString(::GetLastError())));
+  }
+
   DWORD dwSize = SizeofResource(mod, hResource);
 
   QString outFile = QDir::tempPath() + "/" + szFilename;
 
   HANDLE hFile = CreateFileW(outFile.toStdWString().c_str(), GENERIC_READ | GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
+  if (hFile == INVALID_HANDLE_VALUE) {
+    if (::GetLastError() == ERROR_SHARING_VIOLATION) {
+      // dll exists and is opened by another instance of MO, shouldn't be outdated then...
+      return outFile;
+    } else {
+      throw MyException(QString("failed to open python runner: %1").arg(windowsErrorString(::GetLastError())));
+    }
+  }
   HANDLE hFileMap = CreateFileMapping(hFile, nullptr, PAGE_READWRITE, 0, dwSize, nullptr);
+  if (hFileMap == NULL) {
+    throw MyException(QString("failed to map python runner: %1").arg(windowsErrorString(::GetLastError())));
+  }
   LPVOID lpAddress = MapViewOfFile(hFileMap, FILE_MAP_WRITE, 0, 0, 0);
+  if (lpAddress == nullptr) {
+    throw MyException(QString("failed to map view of file: %1").arg(windowsErrorString(::GetLastError())));
+  }
 
   CopyMemory(lpAddress, lpFile, dwSize);
 
@@ -117,8 +135,9 @@ bool ProxyPython::init(IOrganizer *moInfo)
     return true;
   }
 
-  m_TempRunnerFile = ExtractResource(IDR_LOADER_DLL, "__pythonRunner.dll");
-  m_RunnerLib = ::LoadLibraryW(ToWString(m_TempRunnerFile).c_str());
+  //m_TempRunnerFile = ExtractResource(IDR_LOADER_DLL, "__pythonRunner.dll");
+  //m_RunnerLib = ::LoadLibraryW(ToWString(m_TempRunnerFile).c_str());
+  m_RunnerLib = ::LoadLibraryW(QDir::toNativeSeparators(m_MOInfo->pluginDataPath() + "/pythonRunner.dll").toStdWString().c_str());
   if (m_RunnerLib != nullptr) {
     CreatePythonRunner_func CreatePythonRunner = (CreatePythonRunner_func)::GetProcAddress(m_RunnerLib, "CreatePythonRunner");
     if (CreatePythonRunner == nullptr) {

src/proxy/proxypython.h

@@ -28,7 +28,7 @@ along with python proxy plugin.  If not, see <http://www.gnu.org/licenses/>.
 #include <pythonrunner.h>
 
 
-class ProxyPython : public QObject, MOBase::IPluginProxy, MOBase::IPluginDiagnose
+class ProxyPython : public QObject, public MOBase::IPluginProxy, public MOBase::IPluginDiagnose
 {
   Q_OBJECT
   Q_INTERFACES(MOBase::IPlugin MOBase::IPluginProxy MOBase::IPluginDiagnose)

src/runner/SConscript

@@ -0,0 +1,63 @@
+Import('qt_env')
+
+env = qt_env.Clone()
+
+env.EnableQtModules('Core', 'Gui')
+
+env.AppendUnique(CPPDEFINES = 'PYTHONRUNNER_LIBRARY')
+
+# suppress a few warnings caused by boost vs vc++ paranoia
+# NB HAVE_ROUND causes a warning because it's defined in pythonrunner.cpp
+env.AppendUnique(CPPDEFINES = [
+    '_SCL_SECURE_NO_WARNINGS',
+    'HAVE_ROUND'
+])
+
+# Boost produces very long names with msvc truncates. Doesn't seem to cause
+# problems.
+env.AppendUnique(CPPFLAGS = [ '-wd4503' ])
+
+#  QMAKE_CXXFLAGS += /Zi
+#  QMAKE_LFLAGS += /DEBUG
+
+env.RequireLibraries('uibase')
+
+# AppendUnique appears not to work with QT4
+env['CPPPATH'] += [
+    '${BOOSTPATH}',
+    '${PYTHONPATH}\\include',
+]
+
+env.AppendUnique(LIBS = [
+    'python27',  # Could be done better
+])
+
+env.AppendUnique(LIBPATH = [
+    '${PYTHONPATH}/libs',  # Could be done better
+])
+
+# We have to 'persuade' moc to generate certain other targets and inject them
+# into the list of cpps
+targets = env.AddExtraMoc(env.Glob('*.h'))
+
+# pythontoolwrapper doesnt compile and isn't in the project file
+cpp_files = [
+    x for x in Glob('*.cpp') if x.name != 'pythontoolwrapper.cpp'
+]
+
+lib = env.SharedLibrary('pythonRunner', cpp_files + targets)
+
+env.InstallModule(lib, 'plugins/data')
+
+# However...
+# we do need boost-python and pythonvv.dll and pythonvv.zip (though the last
+# isn't needed to just bring up the module)
+#env.Pseudo('install')
+#env.Depends('install',
+#            (env.Install('${INSTALL_PATH}', 'pyCfg.py'),
+#             env.Install(os.path.join('${INSTALL_PATH}', 'data'),
+#                         ( ui, rc, 'settings.json' )),
+#             ))
+
+res = env['QT_USED_MODULES']
+Return('res')

src/runner/pythonRunner.pro

@@ -13,7 +13,7 @@ CONFIG += warn_on
 DEFINES += PYTHONRUNNER_LIBRARY
 
 # suppress a few warnings caused by boost vs vc++ paranoia
-DEFINES += _SCL_SECURE_NO_WARNINGS HAVE_ROUND
+DEFINES += _SCL_SECURE_NO_WARNINGS HAVE_ROUND NOMINMAX
 
 
 !include(../LocalPaths.pri) {
@@ -37,8 +37,8 @@ CONFIG(debug, debug|release) {
   LIBS += -L$$OUT_PWD/../uibase/debug
 } else {
   LIBS += -L$$OUT_PWD/../uibase/release
-  QMAKE_CXXFLAGS += /Zi
-  QMAKE_LFLAGS += /DEBUG
+  msvc:QMAKE_CXXFLAGS += /Zi
+  msvc:QMAKE_LFLAGS += /DEBUG
 }
 
 INCLUDEPATH += "$${BOOSTPATH}" "$${PYTHONPATH}/include" "$${PYTHONPATH}/Lib/site-packages/PyQt5/include" ../uibase
@@ -57,4 +57,8 @@ CONFIG(debug, debug|release) {
 SRCDIR ~= s,/,$$QMAKE_DIR_SEP,g
 DSTDIR ~= s,/,$$QMAKE_DIR_SEP,g
 
+QMAKE_POST_LINK += xcopy /y /s /i $$quote($$SRCDIR\\$${TARGET}*.dll) $$quote($$DSTDIR)\\plugins\\data $$escape_expand(\\n)
 QMAKE_POST_LINK += xcopy /y /I $$quote($$SRCDIR\\$${TARGET}*.pdb) $$quote($$DSTDIR)\\plugins $$escape_expand(\\n)
+
+OTHER_FILES += \
+    SConscript

src/runner/pythonrunner.cpp

@@ -385,6 +385,7 @@ template <> struct MetaData<IDownloadManager> { static const char *className() {
 template <> struct MetaData<QObject> { static const char *className() { return "QObject"; } };
 template <> struct MetaData<QWidget> { static const char *className() { return "QWidget"; } };
 template <> struct MetaData<QIcon> { static const char *className() { return "QIcon"; } };
+template <> struct MetaData<QStringList> { static const char *className() { return "QStringList"; } };
 template <> struct MetaData<QVariant> { static const char *className() { return "QVariant"; } };
 
 
@@ -648,6 +649,7 @@ BOOST_PYTHON_MODULE(mobase)
   //QClass_converters<QObject>();
   QClass_converters<QWidget>();
   QClass_converters<QIcon>();
+  QClass_converters<QStringList>();
   QInterface_converters<IDownloadManager>();
 
 
@@ -718,7 +720,7 @@ BOOST_PYTHON_MODULE(mobase)
       .def("persistent", bpy::pure_virtual(&IOrganizer::persistent))
       .def("setPersistent", bpy::pure_virtual(&IOrganizer::setPersistent))
       .def("pluginDataPath", bpy::pure_virtual(&IOrganizer::pluginDataPath))
-      .def("installMod", bpy::pure_virtual(&IOrganizer::installMod), bpy::return_value_policy<bpy::reference_existing_object>())
+      .def("installMod", bpy::pure_virtual(&IOrganizer::installMod),(bpy::arg("nameSuggestion")=""), bpy::return_value_policy<bpy::reference_existing_object>())
       .def("downloadManager", bpy::pure_virtual(&IOrganizer::downloadManager), bpy::return_value_policy<bpy::reference_existing_object>())
       .def("pluginList", bpy::pure_virtual(&IOrganizer::pluginList), bpy::return_value_policy<bpy::reference_existing_object>())
       .def("modList", bpy::pure_virtual(&IOrganizer::modList), bpy::return_value_policy<bpy::reference_existing_object>())
@@ -771,6 +773,9 @@ BOOST_PYTHON_MODULE(mobase)
       .def("setIsEndorsed", bpy::pure_virtual(&IModInterface::setIsEndorsed))
       .def("setNexusID", bpy::pure_virtual(&IModInterface::setNexusID))
       .def("addNexusCategory", bpy::pure_virtual(&IModInterface::addNexusCategory))
+      .def("addCategory", bpy::pure_virtual(&IModInterface::addCategory))
+      .def("removeCategory", bpy::pure_virtual(&IModInterface::removeCategory))
+      .def("categories", bpy::pure_virtual(&IModInterface::categories))
       .def("setName", bpy::pure_virtual(&IModInterface::setName))
       .def("remove", bpy::pure_virtual(&IModInterface::remove))
       ;
@@ -814,7 +819,9 @@ BOOST_PYTHON_MODULE(mobase)
   Functor2_converter<const QString&, IModList::ModStates>(); // converter for the onModStateChanged-callback
   bpy::class_<IModListWrapper, boost::noncopyable>("IModList")
       .def("displayName", bpy::pure_virtual(&MOBase::IModList::displayName))
+      .def("allMods", bpy::pure_virtual(&MOBase::IModList::allMods))
       .def("state", bpy::pure_virtual(&MOBase::IModList::state))
+      .def("setActive", bpy::pure_virtual(&MOBase::IModList::setActive))
       .def("priority", bpy::pure_virtual(&MOBase::IModList::priority))
       .def("setPriority", bpy::pure_virtual(&MOBase::IModList::setPriority))
       .def("onModStateChanged", bpy::pure_virtual(&MOBase::IModList::onModStateChanged))

src/runner/uibasewrappers.h

@@ -15,6 +15,9 @@
 #include <imodrepositorybridge.h>
 #include <imodinterface.h>
 #include <iinstallationmanager.h>
+#include <idownloadmanager.h>
+#include <ipluginlist.h>
+#include <imodlist.h>
 #include "error.h"
 #include "gilock.h"
 
@@ -214,7 +217,7 @@ struct IOrganizerWrapper: MOBase::IOrganizer, boost::python::wrapper<MOBase::IOr
   virtual QVariant persistent(const QString &pluginName, const QString &key, const QVariant &def = QVariant()) const { return this->get_override("persistent")(pluginName, key, def); }
   virtual void setPersistent(const QString &pluginName, const QString &key, const QVariant &value, bool sync = true) { this->get_override("setPersistent")(pluginName, key, value, sync); }
   virtual QString pluginDataPath() const { return this->get_override("pluginDataPath")(); }
-  virtual MOBase::IModInterface *installMod(const QString &fileName) { return this->get_override("installMod")(fileName); }
+  virtual MOBase::IModInterface *installMod(const QString &fileName, const QString &nameSuggestion = QString()) { return this->get_override("installMod")(fileName, nameSuggestion); }
   virtual MOBase::IDownloadManager *downloadManager() { return this->get_override("downloadManager")(); }
   virtual MOBase::IPluginList *pluginList() { return this->get_override("pluginList")(); }
   virtual MOBase::IModList *modList() { return this->get_override("modList")(); }
@@ -263,21 +266,24 @@ struct IGameInfoWrapper: MOBase::IGameInfo, boost::python::wrapper<MOBase::IGame
 
 struct IModInterfaceWrapper: MOBase::IModInterface, boost::python::wrapper<MOBase::IModInterface>
 {
-  virtual QString name() const { return this->get_override("name")();  }
-  virtual QString absolutePath() const { return this->get_override("absolutePath")(); }
-  virtual void setVersion(const MOBase::VersionInfo &version) { this->get_override("setVersion")(version); }
-  virtual void setNewestVersion(const MOBase::VersionInfo &version) { this->get_override("setNewestVersion")(version); }
-  virtual void setIsEndorsed(bool endorsed) { this->get_override("setIsEndorsed")(endorsed); }
-  virtual void setNexusID(int nexusID) { this->get_override("setNexusID")(nexusID); }
-  virtual void setInstallationFile(const QString &fileName) { this->get_override("setInstallationFile")(fileName); }
-  virtual void addNexusCategory(int categoryID) { this->get_override("addNexusCategory")(categoryID); }
-  virtual bool setName(const QString &name) { return this->get_override("setName")(name); }
-  virtual bool remove() { return this->get_override("remove")(); }
+  virtual QString name() const override { return this->get_override("name")();  }
+  virtual QString absolutePath() const override { return this->get_override("absolutePath")(); }
+  virtual void setVersion(const MOBase::VersionInfo &version) override { this->get_override("setVersion")(version); }
+  virtual void setNewestVersion(const MOBase::VersionInfo &version) override { this->get_override("setNewestVersion")(version); }
+  virtual void setIsEndorsed(bool endorsed) override { this->get_override("setIsEndorsed")(endorsed); }
+  virtual void setNexusID(int nexusID) override { this->get_override("setNexusID")(nexusID); }
+  virtual void setInstallationFile(const QString &fileName) override { this->get_override("setInstallationFile")(fileName); }
+  virtual void addNexusCategory(int categoryID) override { this->get_override("addNexusCategory")(categoryID); }
+  virtual bool setName(const QString &name) override { return this->get_override("setName")(name); }
+  virtual bool remove() override { return this->get_override("remove")(); }
+  virtual void addCategory(const QString &categoryName) override { this->get_override("addCategory")(categoryName); }
+  virtual bool removeCategory(const QString &categoryName) override { return this->get_override("removeCategory")(categoryName); }
+  virtual QStringList categories() override { return this->get_override("categories")(); }
 };
 
 
 struct IPluginListWrapper: MOBase::IPluginList, boost::python::wrapper<MOBase::IPluginList> {
-  virtual PluginState state(const QString &name) const { return this->get_override("state")(name); }
+  virtual PluginStates state(const QString &name) const { return this->get_override("state")(name); }
   virtual int priority(const QString &name) const { return this->get_override("priority")(name); }
   virtual int loadOrder(const QString &name) const { return this->get_override("loadOrder")(name); }
   virtual bool isMaster(const QString &name) const { return this->get_override("isMaster")(name); }
@@ -285,16 +291,19 @@ struct IPluginListWrapper: MOBase::IPluginList, boost::python::wrapper<MOBase::I
   virtual QString origin(const QString &name) const { return this->get_override("origin")(name); }
   virtual bool onRefreshed(const std::function<void ()> &callback) { return this->get_override("onRefreshed")(callback); }
   virtual bool onPluginMoved(const std::function<void (const QString &, int, int)> &callback) { return this->get_override("onPluginMoved")(callback); }
+  virtual bool onPluginStateChanged(const std::function<void (const QString &, PluginStates)> &callback) override { return this->get_override("onPluginStateChanged")(callback); }
 };
 
 
 struct IModListWrapper: MOBase::IModList, boost::python::wrapper<MOBase::IModList> {
-  virtual QString displayName(const QString &internalName) const { return this->get_override("displayName")(internalName); }
-  virtual ModStates state(const QString &name) const { return this->get_override("state")(name); }
-  virtual int priority(const QString &name) const { return this->get_override("priority")(name); }
-  virtual bool setPriority(const QString &name, int newPriority) { return this->get_override("setPriority")(name, newPriority); }
-  virtual bool onModStateChanged(const std::function<void (const QString &, ModStates)> &func) { return this->get_override("onModStateChanged")(func); }
-  virtual bool onModMoved(const std::function<void (const QString &, int, int)> &func) { return this->get_override("onModMoved")(func); }
+  virtual QString displayName(const QString &internalName) const override { return this->get_override("displayName")(internalName); }
+  virtual QStringList allMods() const override { return this->get_override("allMods")(); }
+  virtual ModStates state(const QString &name) const override { return this->get_override("state")(name); }
+  virtual int priority(const QString &name) const override { return this->get_override("priority")(name); }
+  virtual bool setActive(const QString &name, bool active) override { return this->get_override("setActive")(name, active); }
+  virtual bool setPriority(const QString &name, int newPriority) override { return this->get_override("setPriority")(name, newPriority); }
+  virtual bool onModStateChanged(const std::function<void (const QString &, ModStates)> &func) override { return this->get_override("onModStateChanged")(func); }
+  virtual bool onModMoved(const std::function<void (const QString &, int, int)> &func) override { return this->get_override("onModMoved")(func); }
 };
 
 #endif // UIBASEWRAPPERS_H