post-merge cleanup

Affects rather a lot of stuff.

src/SConscript

@@ -0,0 +1,15 @@
+Import('qt_env')
+
+env = qt_env.Clone()
+
+env.DisableQtModules('Gui')
+env.AppendUnique(CPPDEFINES = [ 'INSTALLERBUNDLE_LIBRARY' ])
+
+# Sigh
+env['CPPPATH'] += [ '.' ]
+
+lib = env.SharedLibrary('installerBundle', env.Glob('*.cpp'))
+env.InstallModule(lib)
+
+res = env['QT_USED_MODULES']
+Return('res')

src/installerBundle.pro

@@ -27,4 +27,5 @@ HEADERS += installerbundle.h
 include(../plugin_template.pri)
 
 OTHER_FILES += \
-    installerbundle.json
+    installerbundle.json\
+    SConscript

src/installerbundle.cpp

@@ -1,105 +1,119 @@
-/*
-Copyright (C) 2012 Sebastian Herbord. All rights reserved.
-
-This file is part of Mod Organizer.
-
-Mod Organizer 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.
-
-Mod Organizer 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 Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#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;
-    }
-  }
-  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) {
-    if (fileIter->getName().endsWith(".fomod", Qt::CaseInsensitive)) {
-      QString tempFile = manager()->extractFile(fileIter->getName());
-      return manager()->installArchive(modName, tempFile);
-    }
-  }
-  return IPluginInstaller::RESULT_NOTATTEMPTED;
-}
-
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
-Q_EXPORT_PLUGIN2(installerBundle, InstallerBundle)
-#endif
+/*
+Copyright (C) 2012 Sebastian Herbord. All rights reserved.
+
+This file is part of Mod Organizer.
+
+Mod Organizer 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.
+
+Mod Organizer 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 Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#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, 1, 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")) {
+      return true;
+    }
+  }
+  if ((tree.numNodes() == 0)
+      && (tree.numLeafs() == 1)
+      && (tree.leafsBegin()->getName().endsWith(".7z")
+          || tree.leafsBegin()->getName().endsWith(".rar"))) {
+    // 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) {
+    FileNameString name = fileIter->getName();
+    if (name.endsWith(".fomod")
+        || name.endsWith(".7z")
+        || name.endsWith(".rar")) {
+      QString tempFile = manager()->extractFile(name.toQString());
+      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

@@ -1,57 +1,57 @@
-/*
-Copyright (C) 2012 Sebastian Herbord. All rights reserved.
-
-This file is part of Mod Organizer.
-
-Mod Organizer 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.
-
-Mod Organizer 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 Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#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
+/*
+Copyright (C) 2012 Sebastian Herbord. All rights reserved.
+
+This file is part of Mod Organizer.
+
+Mod Organizer 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.
+
+Mod Organizer 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 Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#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