Merge with default

- bugfix: crash after removing the last profile in the list (ordered alphabetically)
- improved subdirs ordering to ensure pythonrunner is compiled before pythonproxy
- translation files for plugins are now generated
- set some texts as un-translatable where it made no sense
- staging script now re-builds MO completely before packaging
- updated qt libraries for packaging to 4.8.5
- added python to the package

src/proxy/proxyPython.pro

@@ -22,6 +22,9 @@ CONFIG(release, debug|release) {
 
 DEFINES += PROXYPYTHON_LIBRARY
 
+# suppress a few warnings caused by boost vs vc++ paranoia
+DEFINES += _SCL_SECURE_NO_WARNINGS
+
 SOURCES += proxypython.cpp
 HEADERS += proxypython.h \
     resource.h
@@ -35,15 +38,14 @@ RC_FILE += \
 
 include(../plugin_template.pri)
 
-INCLUDEPATH += "../../pythonRunner"
+INCLUDEPATH += "../../pythonRunner" "$(BOOSTPATH)"
 
 WINPWD = $$PWD
 WINPWD ~= s,/,$$QMAKE_DIR_SEP,g
 
-
 //QMAKE_POST_LINK += SET VS90COMNTOOLS=%VS100COMNTOOLS% $$escape_expand(\\n)
 
 
-QMAKE_POST_LINK += copy $$(PYTHONPATH)\\lib\\site-packages\\sip.pyd $$quote($$DSTDIR)\\plugins\\data\\ $$escape_expand(\\n)
-QMAKE_POST_LINK += copy $$(PYTHONPATH)\\lib\\site-packages\\PyQt4\\QtCore.pyd $$quote($$DSTDIR)\\plugins\\data\\PyQt4\\ $$escape_expand(\\n)
-QMAKE_POST_LINK += copy $$(PYTHONPATH)\\lib\\site-packages\\PyQt4\\QtGui.pyd $$quote($$DSTDIR)\\plugins\\data\\PyQt4\\ $$escape_expand(\\n)
+//QMAKE_POST_LINK += copy $$(PYTHONPATH)\\lib\\site-packages\\sip.pyd $$quote($$DSTDIR)\\plugins\\data\\ $$escape_expand(\\n)
+//QMAKE_POST_LINK += copy $$(PYTHONPATH)\\lib\\site-packages\\PyQt4\\QtCore.pyd $$quote($$DSTDIR)\\plugins\\data\\PyQt4\\ $$escape_expand(\\n)
+//QMAKE_POST_LINK += copy $$(PYTHONPATH)\\lib\\site-packages\\PyQt4\\QtGui.pyd $$quote($$DSTDIR)\\plugins\\data\\PyQt4\\ $$escape_expand(\\n)

src/proxy/proxypython.cpp

@@ -1,17 +1,31 @@
-#pragma warning( push )
-#pragma warning( disable : 4100 ) // a lot of unreferenced formal parameters from boost libraries
-#pragma warning( disable : 4996 ) // strncpy claimed to be unsafe
+/*
+Copyright (C) 2013 Sebastian Herbord. All rights reserved.
+
+This file is part of python proxy plugin for MO
+
+python proxy plugin is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Python proxy plugin 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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with python proxy plugin.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 
 #include "proxypython.h"
-
-#pragma warning( pop )
-
 #include <utility.h>
 #include <versioninfo.h>
 #include <QtPlugin>
 #include <QDirIterator>
 #include <QWidget>
 #include <QMessageBox>
+#include <QCoreApplication>
 #include "resource.h"
 
 
@@ -33,8 +47,6 @@ HMODULE GetOwnModuleHandle()
 
 QString ExtractResource(WORD resourceID, const QString &szFilename)
 {
-  bool success = false;
-
   HMODULE mod = GetOwnModuleHandle();
 
   HRSRC hResource = FindResourceW(mod, MAKEINTRESOURCE(resourceID), L"BINARY");
@@ -92,6 +104,10 @@ bool ProxyPython::init(IOrganizer *moInfo)
   }
 
   m_LoadFailure = FAIL_OTHER;
+  if (QCoreApplication::applicationDirPath().contains(';')) {
+    m_LoadFailure = FAIL_SEMICOLON;
+    return true;
+  }
 
   QString pythonPath = m_MOInfo->pluginSetting(name(), "python_dir").toString();
 
@@ -213,6 +229,8 @@ std::vector<unsigned int> ProxyPython::activeProblems() const
     result.push_back(PROBLEM_PYTHONDETECTION);
   } else if (m_LoadFailure == FAIL_INITFAIL) {
     result.push_back(PROBLEM_INITFAIL);
+  } else if (m_LoadFailure == FAIL_SEMICOLON) {
+    result.push_back(PROBLEM_SEMICOLON);
   } else if (m_Runner != NULL) {
     if (!m_Runner->isPythonInstalled()) {
       // don't know how this could happen but wth
@@ -244,6 +262,9 @@ QString ProxyPython::shortDescription(unsigned int key) const
     case PROBLEM_PYTHONDETECTION: {
       return tr("Python auto-detection failed");
     } break;
+    case PROBLEM_SEMICOLON: {
+      return tr("ModOrganizer path contains a semicolon");
+    } break;
     default:
       throw MyException(tr("invalid problem key %1").arg(key));
   }
@@ -276,8 +297,15 @@ QString ProxyPython::fullDescription(unsigned int key) const
     case PROBLEM_INITFAIL: {
       return tr("Sorry, I don't know any details. Most likely your python installation is not supported.");
     } break;
+    case PROBLEM_SEMICOLON: {
+      return tr("The path to Mod Organizer (%1) contains a semicolon. <br>"
+                "While this is legal on NTFS drives there is a lot of software that doesn't handle it correctly.<br>"
+                "Unfortunately MO depends on libraries that seem to fall into that group.<br>"
+                "As a result the python plugin can't be loaded.<br>"
+                "The only solution I can offer is to remove the semicolon / move MO to a path without a semicolon.").arg(QCoreApplication::applicationDirPath());
+    } break;
     default:
-      throw MyException(tr("invalid problem key %1").arg(key));
+      throw MyException(QString("invalid problem key %1").arg(key));
   }
 }
 

src/proxy/proxypython.h

@@ -1,3 +1,22 @@
+/*
+Copyright (C) 2013 Sebastian Herbord. All rights reserved.
+
+This file is part of python proxy plugin for MO
+
+python proxy plugin is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Python proxy plugin 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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with python proxy plugin.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #ifndef PROXYPYTHON_H
 #define PROXYPYTHON_H
 
@@ -53,6 +72,7 @@ private:
   static const unsigned int PROBLEM_WRONGPYTHONPATH = 3;
   static const unsigned int PROBLEM_INITFAIL = 4;
   static const unsigned int PROBLEM_PYTHONDETECTION = 5;
+  static const unsigned int PROBLEM_SEMICOLON = 6;
   static const char *s_DownloadPythonURL;
 
   MOBase::IOrganizer *m_MOInfo;
@@ -62,6 +82,7 @@ private:
 
   enum {
     FAIL_NONE,
+    FAIL_SEMICOLON,
     FAIL_NOTINIT,
     FAIL_MISSINGDEPENDENCIES,
     FAIL_INITFAIL,

src/runner/proxypluginwrappers.cpp

@@ -171,7 +171,7 @@ bool IPluginInstallerCustomWrapper::isManualInstaller() const
   } PYCATCH;
 }
 
-bool IPluginInstallerCustomWrapper::isArchiveSupported(const DirectoryTree &tree) const
+bool IPluginInstallerCustomWrapper::isArchiveSupported(const DirectoryTree &) const
 {
   try {
     //return this->get_override("isArchiveSupported")(tree);

src/runner/pythonRunner.pro

@@ -12,6 +12,9 @@ CONFIG += warn_on
 
 DEFINES += PYTHONRUNNER_LIBRARY
 
+# suppress a few warnings caused by boost vs vc++ paranoia
+DEFINES += _SCL_SECURE_NO_WARNINGS
+
 SOURCES += pythonrunner.cpp \
     gilock.cpp \
     error.cpp \
@@ -31,6 +34,8 @@ CONFIG(debug, debug|release) {
   LIBS += -L$$OUT_PWD/../uibase/debug
 } else {
   LIBS += -L$$OUT_PWD/../uibase/release
+	QMAKE_CXXFLAGS += /Zi
+	QMAKE_LFLAGS += /DEBUG
 }
 
 

src/runner/pythonrunner.cpp

@@ -11,6 +11,7 @@
 #include <Windows.h>
 #include <utility.h>
 #include <QFile>
+#include <QCoreApplication>
 
 // sip and qt slots seems to conflict
 #include <sip.h>
@@ -36,15 +37,15 @@ public:
 
 private:
 
+  void initPath(boost::python::object &moduleNamespace);
+
+private:
   std::map<QString, boost::python::object> m_PythonObjects;
   const MOBase::IOrganizer *m_MOInfo;
   char *m_PythonHome;
 };
 
 
-
-
-
 IPythonRunner *CreatePythonRunner(const MOBase::IOrganizer *moInfo, const QString &pythonDir)
 {
   PythonRunner *result = new PythonRunner(moInfo);
@@ -577,7 +578,12 @@ BOOST_PYTHON_MODULE(mobase)
       .def("setPersistent", bpy::pure_virtual(&IOrganizer::setPersistent))
       .def("pluginDataPath", bpy::pure_virtual(&IOrganizer::pluginDataPath))
       .def("installMod", bpy::pure_virtual(&IOrganizer::installMod))
-      .def("downloadManager", bpy::pure_virtual(&IOrganizer::downloadManager), 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("startApplication", bpy::pure_virtual(&IOrganizer::startApplication), bpy::return_value_policy<bpy::return_by_value>())
+      .def("onAboutToRun", bpy::pure_virtual(&IOrganizer::onAboutToRun))
+      .def("refreshModList", bpy::pure_virtual(&IOrganizer::refreshModList))
+      ;
 
   bpy::class_<ModRepositoryBridgeWrapper, boost::noncopyable>("ModRepositoryBridge")
       .def("requestDescription", &ModRepositoryBridgeWrapper::requestDescription)
@@ -632,6 +638,7 @@ PythonRunner::PythonRunner(const MOBase::IOrganizer *moInfo)
 
 static char* argv0 = "ModOrganizer.exe";
 
+
 bool PythonRunner::initPython(const QString &pythonPath)
 {
   try {
@@ -645,21 +652,25 @@ bool PythonRunner::initPython(const QString &pythonPath)
 
     Py_SetProgramName(argv0);
     PyImport_AppendInittab("mobase", &initmobase);
-
+    Py_OptimizeFlag = 2;
+    Py_NoSiteFlag = 1;
     Py_InitializeEx(0);
+
     if (!Py_IsInitialized()) {
       return false;
     }
 
     PySys_SetArgv(0, &argv0);
 
-    bpy::object main_module = bpy::import("__main__");
-    bpy::object main_namespace = main_module.attr("__dict__");
-    main_namespace["cStringIO"] = bpy::import("cStringIO");
-    main_namespace["sys"] = bpy::import("sys");
+    bpy::object mainModule = bpy::import("__main__");
+    bpy::object mainNamespace = mainModule.attr("__dict__");
+    mainNamespace["sys"] = bpy::import("sys");
+    initPath(mainNamespace);
+    bpy::import("site");
+    mainNamespace["cStringIO"] = bpy::import("cStringIO");
     bpy::exec("s_ErrIO = cStringIO.StringIO()\n"
                         "sys.stderr = s_ErrIO",
-                        main_namespace);
+                        mainNamespace);
     return true;
   } catch (const bpy::error_already_set&) {
     qDebug("failed to init python");
@@ -689,26 +700,41 @@ bool handled_exec_file(bpy::str filename, bpy::object globals = bpy::object(), b
   } while (false)
 
 
+void PythonRunner::initPath(bpy::object &moduleNamespace)
+{
+  static QString paths[] = {
+      m_MOInfo->pluginDataPath(),
+      QCoreApplication::applicationDirPath(),
+      QCoreApplication::applicationDirPath() + "/python27.zip",
+      QCoreApplication::applicationDirPath() + "/python27.zip/Lib",
+      QCoreApplication::applicationDirPath() + "/python27.zip/DLLs",
+      QCoreApplication::applicationDirPath() + "/python27.zip/Lib/site-packages",
+    };
+
+  for (int i = 0; i < sizeof(paths) / sizeof(QString); ++i) {
+    QString expr = QString("sys.path.insert(%1, \"%2\")").arg(i).arg(paths[i]);
+    bpy::eval(expr.toUtf8().constData(), moduleNamespace);
+  }
+}
+
+
 QObject *PythonRunner::instantiate(const QString &pluginName)
 {
   try {
     GILock lock;
-    bpy::object main_module = bpy::import("__main__");
-    bpy::object main_namespace = main_module.attr("__dict__");
+    bpy::object mainModule = bpy::import("__main__");
+    bpy::object moduleNamespace = mainModule.attr("__dict__");
 
-    bpy::object mobase_module((bpy::handle<>(PyImport_ImportModule("mobase"))));
-    main_namespace["sys"] = bpy::import("sys");
-    main_namespace["mobase"] = mobase_module;
-    QString appendDataPath = QString("sys.path.insert(0, \"%1\")").arg(m_MOInfo->pluginDataPath());
-
-    bpy::eval(appendDataPath.toUtf8().constData(), main_namespace);
+    bpy::object sys = bpy::import("sys");
+    moduleNamespace["sys"] = sys;
+    moduleNamespace["mobase"] = bpy::import("mobase");
 
     std::string temp = ToString(pluginName);
-    if (handled_exec_file(temp.c_str(), main_namespace)) {
+    if (handled_exec_file(temp.c_str(), moduleNamespace)) {
       reportPythonError();
       return NULL;
     }
-    m_PythonObjects[pluginName] = main_namespace["createPlugin"]();
+    m_PythonObjects[pluginName] = moduleNamespace["createPlugin"]();
 
     bpy::object pluginObj = m_PythonObjects[pluginName];
     TRY_PLUGIN_TYPE(IPluginInstallerCustom, pluginObj);

src/runner/pythonrunner_global.h

@@ -1,12 +0,0 @@
-#ifndef PYTHONRUNNER_GLOBAL_H
-#define PYTHONRUNNER_GLOBAL_H
-
-#include <QtCore/qglobal.h>
-
-#if defined(PYTHONRUNNER_LIBRARY)
-#  define PYTHONRUNNERSHARED_EXPORT Q_DECL_EXPORT
-#else
-#  define PYTHONRUNNERSHARED_EXPORT Q_DECL_IMPORT
-#endif
-
-#endif // PYTHONRUNNER_GLOBAL_H

src/runner/uibasewrappers.h

@@ -119,10 +119,6 @@ struct IOrganizerWrapper: MOBase::IOrganizer, boost::python::wrapper<MOBase::IOr
   virtual MOBase::IModRepositoryBridge *createNexusBridge() const {
     return this->get_override("createNexusBridge")();
   }
-/*
-  static ModRepositoryBridgeWrapper newNexusBridge(IOrganizerWrapper *self) {
-    return ModRepositoryBridgeWrapper(self->createNexusBridge());
-  }*/
 
   virtual QString profileName() const { return this->get_override("profileName")(); }
   virtual QString profilePath() const { return this->get_override("profilePath")(); }
@@ -139,7 +135,15 @@ struct IOrganizerWrapper: MOBase::IOrganizer, boost::python::wrapper<MOBase::IOr
   virtual QString pluginDataPath() const { return this->get_override("pluginDataPath")(); }
   virtual void installMod(const QString &fileName) { this->get_override("installMod")(fileName); }
   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")(); }
   virtual QString resolvePath(const QString &fileName) const { return this->get_override("resolvePath")(fileName); }
+  virtual QStringList listDirectories(const QString &directoryName) const { return this->get_override("listDirectories")(directoryName); }
+  virtual QStringList findFiles(const QString &path, const std::function<bool(const QString&)> &filter) const { return this->get_override("findFiles")(path, filter); }
+  virtual QList<FileInfo> findFileInfos(const QString &path, const std::function<bool(const FileInfo&)> &filter) const { return this->get_override("findFileInfos")(path, filter); }
+  virtual HANDLE startApplication(const QString &executable, const QStringList &args = QStringList(), const QString &cwd = "", const QString &profile = "") { return this->get_override("startApplication")(executable, args, cwd, profile); }
+  virtual bool onAboutToRun(const std::function<bool(const QString&)> &func) { return this->get_override("onAboutToRun")(func); }
+  virtual void refreshModList(bool saveChanges = true) { this->get_override("refreshModList")(saveChanges); }
 };
 
 struct IDownloadManagerWrapper: MOBase::IDownloadManager, boost::python::wrapper<MOBase::IDownloadManager>