From d4cc50ade8e4163b2f8701fda62b9e02acd88ea8 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Thu, 6 Jun 2013 20:19:38 +0200
Subject: [PATCH] - bugfix: archive file wasn't closed after installation -
 bugfix: batch installer was treated as handler for "manual" installations -
 bugfix: dropped include of unused sip interface

---
 src/proxy/INexusBridge.sip | 34 ++++++++++++++++++++++++++--------
 src/proxy/interfaces.sbf   |  3 ---
 src/proxy/proxyPython.pro  |  8 ++------
 src/proxy/proxypython.cpp  |  1 -
 src/proxy/uibasewrappers.h |  2 --
 5 files changed, 28 insertions(+), 20 deletions(-)
 delete mode 100644 src/proxy/interfaces.sbf

diff --git a/src/proxy/INexusBridge.sip b/src/proxy/INexusBridge.sip
index d1e4e19..b7f6cd0 100644
--- a/src/proxy/INexusBridge.sip
+++ b/src/proxy/INexusBridge.sip
@@ -5,11 +5,29 @@
 namespace MOBase
 {
 
-class INexusBridge : public QObject
+class ModRepositoryFileInfo
 {
 
 %TypeHeaderCode
-#include <inexusbridge.h>
+#include <imodrepositorybridge.h>
+%End
+
+public:
+
+  ModRepositoryFileInfo();
+  ModRepositoryFileInfo(const QString &data);
+  ~ModRepositoryFileInfo();
+
+  QString toString() const;
+
+};
+
+
+class IModRepositoryBridge : QObject
+{
+
+%TypeHeaderCode
+#include <imodrepositorybridge.h>
 %End
 
 public:
@@ -22,12 +40,12 @@ public:
 
 signals:
 
-	void nxmDescriptionAvailable(int modID, QVariant userData, QVariant resultData);
-	void nxmFilesAvailable(int modID, QVariant userData, QVariant resultData);
-	void nxmFileInfoAvailable(int modID, int fileID, QVariant userData, QVariant resultData);
-	void nxmDownloadURLsAvailable(int modID, int fileID, QVariant userData, QVariant resultData);
-	void nxmEndorsementToggled(int modID, QVariant userData, QVariant resultData);
-	void nxmRequestFailed(int modID, QVariant userData, const QString &errorMessage);
+  void descriptionAvailable(int modID, QVariant userData, QVariant resultData);
+  void filesAvailable(int modID, QVariant userData, const QList<MOBase::ModRepositoryFileInfo> &resultData);
+  void fileInfoAvailable(int modID, int fileID, QVariant userData, QVariant resultData);
+  void downloadURLsAvailable(int modID, int fileID, QVariant userData, QVariant resultData);
+  void endorsementToggled(int modID, QVariant userData, QVariant resultData);
+  void requestFailed(int modID, QVariant userData, const QString &errorMessage);
 
 };
 
diff --git a/src/proxy/interfaces.sbf b/src/proxy/interfaces.sbf
deleted file mode 100644
index 895e683..0000000
--- a/src/proxy/interfaces.sbf
+++ /dev/null
@@ -1,3 +0,0 @@
-target = interfaces
-sources = sipinterfacescmodule.cpp sipinterfacesINexusBridge.cpp
-headers = sipAPIinterfaces.h
diff --git a/src/proxy/proxyPython.pro b/src/proxy/proxyPython.pro
index ca35ad4..005d66e 100644
--- a/src/proxy/proxyPython.pro
+++ b/src/proxy/proxyPython.pro
@@ -33,8 +33,8 @@ LIBS += -L"$$(PYTHONPATH)/libs" -L"$(BOOSTPATH)/stage/lib" -lpython27
 include(../plugin_template.pri)
 
 OTHER_FILES += \
-    INexusBridge.sip \
-    interfaces.sip \
+		INexusBridge.sip \
+		interfaces.sip \
     setup.py \
     setup.cfg
 
@@ -45,7 +45,3 @@ WINPWD ~= s,/,$$QMAKE_DIR_SEP,g
 SIPPATH=""
 
 QMAKE_POST_LINK += SET VS90COMNTOOLS=%VS100COMNTOOLS% $$escape_expand(\\n)
-
-#QMAKE_POST_LINK += $$(PYTHONPATH)/Lib/site-packages/PyQt4/sip.exe -I "$$(PYTHONPATH)/Lib/site-packages/PyQt4/sip/PyQt4" -c . -t WS_WIN -t Qt_4_8_4 -x Py_v2 -b interfaces.sbf -g interfaces.sip $$escape_expand(\\n)
-QMAKE_POST_LINK += $$(PYTHONPATH)/python.exe $$WINPWD\\setup.py build_ext --sip-opts=\"-I C:\\Python27\\Lib\\site-packages\\PyQt4\\sip\\PyQt4 -e -g -t WS_WIN -t Qt_4_8_4\" build $$escape_expand(\\n)
-QMAKE_POST_LINK += copy $$WINPWD\\build\\lib.win32-2.7\\interfaces.pyd $$quote($$DSTDIR)\\plugins\\data\\ $$escape_expand(\\n)
diff --git a/src/proxy/proxypython.cpp b/src/proxy/proxypython.cpp
index 9109751..980f7d4 100644
--- a/src/proxy/proxypython.cpp
+++ b/src/proxy/proxypython.cpp
@@ -695,7 +695,6 @@ QObject *ProxyPython::instantiate(const QString &pluginName)
     QString appendDataPath = QString("sys.path.append(\"%1\")").arg(m_MOInfo->pluginDataPath());
 
     bpy::eval(appendDataPath.toUtf8().constData(), main_namespace);
-    main_namespace["interfaces"] = bpy::import("interfaces");
 
     std::string temp = ToString(pluginName);
     if (handled_exec_file(temp.c_str(), main_namespace)) {
diff --git a/src/proxy/uibasewrappers.h b/src/proxy/uibasewrappers.h
index ac589af..ba75f13 100644
--- a/src/proxy/uibasewrappers.h
+++ b/src/proxy/uibasewrappers.h
@@ -117,8 +117,6 @@ struct IOrganizerWrapper: MOBase::IOrganizer, boost::python::wrapper<MOBase::IOr
     return *result;
   }
   virtual MOBase::IModRepositoryBridge *createNexusBridge() const {
-//    MOBase::IModRepositoryBridge *temp = this->get_override("createNexusBridge")();
-//    return new INexusBridgeWrapper(temp);
     return this->get_override("createNexusBridge")();
   }
 /*