- added an option to show meta info on downloads instead of filenames

- MO will now cancel if user tries to run MO vfs-injected
- when saving the MO ini file it is now written to a tmp file first and then overwritten
- updated to link against boost python 1.55

src/installerBundle.pro

@@ -12,6 +12,11 @@ TEMPLATE = lib
 CONFIG += plugins
 CONFIG += dll
 
+CONFIG(release, debug|release) {
+  QMAKE_CXXFLAGS += /Zi
+  QMAKE_LFLAGS += /DEBUG
+}
+
 DEFINES += INSTALLERBUNDLE_LIBRARY
 
 SOURCES += installerbundle.cpp
@@ -20,3 +25,6 @@ HEADERS += installerbundle.h
 
 
 include(../plugin_template.pri)
+
+OTHER_FILES += \
+    installerbundle.json

src/installerbundle.cpp

@@ -17,84 +17,103 @@ You should have received a copy of the GNU General Public License
 along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "installerbundle.h"
-#include "iinstallationmanager.h"
-
-#include <QtPlugin>
-
-
-InstallerBundle::InstallerBundle()
-{
-}
-
-
-bool InstallerBundle::init(IOrganizer*)
-{
-  return true;
-}
-
-QString InstallerBundle::name() const
-{
-  return "Bundle Installer";
-}
-
-QString InstallerBundle::author() const
-{
-  return "Tannin";
-}
-
-QString InstallerBundle::description() const
-{
-  return tr("Proxy-Installer to handle bundles containing the actual mod archive");
-}
-
-VersionInfo InstallerBundle::version() const
-{
-  return VersionInfo(1, 0, 0, VersionInfo::RELEASE_FINAL);
-}
-
-bool InstallerBundle::isActive() const
-{
-  return true;
-}
-
-QList<PluginSetting> InstallerBundle::settings() const
-{
-  return QList<PluginSetting>();
-}
-
-unsigned int InstallerBundle::priority() const
-{
-  return 10;
-}
-
-bool InstallerBundle::isManualInstaller() const
-{
-  return false;
-}
-
-bool InstallerBundle::isArchiveSupported(const DirectoryTree &tree) const
-{
-  for (DirectoryTree::const_leaf_iterator fileIter = tree.leafsBegin();
-       fileIter != tree.leafsEnd(); ++fileIter) {
-    if (fileIter->getName().endsWith(".fomod", Qt::CaseInsensitive)) {
-      return true;
-    }
-  }
-  return false;
-}
-
-IPluginInstaller::EInstallResult InstallerBundle::install(QString &modName, DirectoryTree &tree)
-{
-  for (DirectoryTree::const_leaf_iterator fileIter = tree.leafsBegin();
-       fileIter != tree.leafsEnd(); ++fileIter) {
-    if (fileIter->getName().endsWith(".fomod", Qt::CaseInsensitive)) {
-      QString tempFile = manager()->extractFile(fileIter->getName());
-      return manager()->installArchive(modName, tempFile);
-    }
-  }
-  return IPluginInstaller::RESULT_NOTATTEMPTED;
-}
-
-
-Q_EXPORT_PLUGIN2(installerBundle, InstallerBundle)
+#include "installerbundle.h"
+#include "iinstallationmanager.h"
+
+#include <QtPlugin>
+
+
+using namespace MOBase;
+
+
+InstallerBundle::InstallerBundle()
+{
+}
+
+
+bool InstallerBundle::init(IOrganizer*)
+{
+  return true;
+}
+
+QString InstallerBundle::name() const
+{
+  return "Bundle Installer";
+}
+
+QString InstallerBundle::author() const
+{
+  return "Tannin";
+}
+
+QString InstallerBundle::description() const
+{
+  return tr("Proxy-Installer to handle bundles containing the actual mod archive");
+}
+
+VersionInfo InstallerBundle::version() const
+{
+  return VersionInfo(1, 0, 0, VersionInfo::RELEASE_FINAL);
+}
+
+bool InstallerBundle::isActive() const
+{
+  return true;
+}
+
+QList<PluginSetting> InstallerBundle::settings() const
+{
+  return QList<PluginSetting>();
+}
+
+unsigned int InstallerBundle::priority() const
+{
+  return 10;
+}
+
+bool InstallerBundle::isManualInstaller() const
+{
+  return false;
+}
+
+bool InstallerBundle::isArchiveSupported(const DirectoryTree &tree) const
+{
+  for (DirectoryTree::const_leaf_iterator fileIter = tree.leafsBegin();
+       fileIter != tree.leafsEnd(); ++fileIter) {
+    if (fileIter->getName().endsWith(".fomod", Qt::CaseInsensitive)) {
+      return true;
+    }
+  }
+  if ((tree.numNodes() == 0)
+      && (tree.numLeafs() == 1)
+      && (tree.leafsBegin()->getName().endsWith(".7z", Qt::CaseInsensitive)
+          || tree.leafsBegin()->getName().endsWith(".rar", Qt::CaseInsensitive))) {
+    // nested archive
+    return true;
+  }
+  return false;
+}
+
+IPluginInstaller::EInstallResult InstallerBundle::install(GuessedValue<QString> &modName, DirectoryTree &tree,
+                                                          QString&, int&)
+{
+  for (DirectoryTree::const_leaf_iterator fileIter = tree.leafsBegin();
+       fileIter != tree.leafsEnd(); ++fileIter) {
+    QString name = fileIter->getName();
+    if (name.endsWith(".fomod", Qt::CaseInsensitive)
+        || name.endsWith(".7z", Qt::CaseInsensitive)
+        || name.endsWith(".rar", Qt::CaseInsensitive)) {
+      QString tempFile = manager()->extractFile(fileIter->getName());
+      IPluginInstaller::EInstallResult res = manager()->installArchive(modName, tempFile);
+      if (res == IPluginInstaller::RESULT_SUCCESS) {
+        res = IPluginInstaller::RESULT_SUCCESSCANCEL;
+      }
+      return res;
+    }
+  }
+  return IPluginInstaller::RESULT_NOTATTEMPTED;
+}
+
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
+Q_EXPORT_PLUGIN2(installerBundle, InstallerBundle)
+#endif

src/installerbundle.h

@@ -17,37 +17,41 @@ You should have received a copy of the GNU General Public License
 along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef INSTALLERBUNDLE_H
-#define INSTALLERBUNDLE_H
-
-
-#include <iplugininstallersimple.h>
-
-
-class InstallerBundle : public IPluginInstallerSimple
-{
-
-  Q_OBJECT
-  Q_INTERFACES(IPlugin IPluginInstaller IPluginInstallerSimple)
-
-public:
-
-  InstallerBundle();
-
-  virtual bool init(IOrganizer *moInfo);
-  virtual QString name() const;
-  virtual QString author() const;
-  virtual QString description() const;
-  virtual VersionInfo version() const;
-  virtual bool isActive() const;
-  virtual QList<PluginSetting> settings() const;
-
-  virtual unsigned int priority() const;
-  virtual bool isManualInstaller() const;
-
-  virtual bool isArchiveSupported(const DirectoryTree &tree) const;
-  virtual EInstallResult install(QString &modName, DirectoryTree &tree);
-};
-
-
-#endif // INSTALLERBUNDLE_H
+#ifndef INSTALLERBUNDLE_H
+#define INSTALLERBUNDLE_H
+
+
+#include <iplugininstallersimple.h>
+
+
+class InstallerBundle : public MOBase::IPluginInstallerSimple
+{
+
+  Q_OBJECT
+  Q_INTERFACES(MOBase::IPlugin MOBase::IPluginInstaller MOBase::IPluginInstallerSimple)
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+  Q_PLUGIN_METADATA(IID "org.tannin.InstallerBundle" FILE "installerbundle.json")
+#endif
+
+public:
+
+  InstallerBundle();
+
+  virtual bool init(MOBase::IOrganizer *moInfo);
+  virtual QString name() const;
+  virtual QString author() const;
+  virtual QString description() const;
+  virtual MOBase::VersionInfo version() const;
+  virtual bool isActive() const;
+  virtual QList<MOBase::PluginSetting> settings() const;
+
+  virtual unsigned int priority() const;
+  virtual bool isManualInstaller() const;
+
+  virtual bool isArchiveSupported(const MOBase::DirectoryTree &tree) const;
+  virtual EInstallResult install(MOBase::GuessedValue<QString> &modName, MOBase::DirectoryTree &tree,
+                                 QString &version, int &modID);
+};
+
+
+#endif // INSTALLERBUNDLE_H