1 files changed, 26 insertions, 22 deletions

diff --git a/src/selfupdater.cpp b/src/selfupdater.cpp
index 5cd6cf36..11478fbc 100644
--- a/src/selfupdater.cpp
+++ b/src/selfupdater.cpp
@@ -18,16 +18,18 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */

 

 #include "selfupdater.h"

+

 #include "utility.h"

 #include "installationmanager.h"

+#include "iplugingame.h"

 #include "messagedialog.h"

 #include "downloadmanager.h"

 #include "nexusinterface.h"

 #include "nxmaccessmanager.h"

 #include <versioninfo.h>

-#include <gameinfo.h>

-#include <skyriminfo.h>

 #include <report.h>

+#include <util.h>

+

 #include <QMessageBox>

 #include <QNetworkAccessManager>

 #include <QNetworkRequest>

@@ -35,7 +37,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QLibrary>

 #include <QProcess>

 #include <QApplication>

-#include <util.h>

 #include <boost/bind.hpp>

 

 

@@ -62,6 +63,7 @@ SelfUpdater::SelfUpdater(NexusInterface *nexusInterface)
   , m_UpdateRequestID(-1)

   , m_Reply(nullptr)

   , m_Attempts(3)

+  , m_NexusDownload(nullptr)

 {

   QLibrary archiveLib("dlls\\archive.dll");

   if (!archiveLib.load()) {

@@ -101,12 +103,10 @@ void SelfUpdater::testForUpdate()
     emit updateAvailable();

     return;

   }

-

-  if (m_UpdateRequestID == -1) {

+  if (m_UpdateRequestID == -1 && m_NexusDownload != nullptr) {

     m_UpdateRequestID = m_Interface->requestDescription(

-              SkyrimInfo::getNexusModIDStatic(), this, QVariant(),

-              QString(), ToQString(SkyrimInfo::getNexusInfoUrlStatic()),

-              SkyrimInfo::getNexusGameIDStatic());

+              m_NexusDownload->getNexusModOrganizerID(), this, QVariant(),

+              QString(), m_NexusDownload);

   }

 }

 

@@ -123,9 +123,9 @@ void SelfUpdater::startUpdate()
     if (QMessageBox::question(m_Parent, tr("Update"),

           tr("An update is available (newest version: %1), do you want to install it?").arg(m_NewestVersion),

           QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {

-      m_UpdateRequestID = m_Interface->requestFiles(SkyrimInfo::getNexusModIDStatic(),

-                                                    this, m_NewestVersion,

-                                                    ToQString(SkyrimInfo::getNexusInfoUrlStatic()));

+      m_UpdateRequestID = m_Interface->requestFiles(m_NexusDownload->getNexusModOrganizerID(),

+                                                    this, m_NewestVersion, "",

+                                                    m_NexusDownload);

     }

   }

 }

@@ -159,7 +159,7 @@ void SelfUpdater::download(const QString &downloadLink, const QString &fileName)
   QNetworkRequest request(dlUrl);

   m_Canceled = false;

   m_Reply = accessManager->get(request);

-  m_UpdateFile.setFileName(QDir::fromNativeSeparators(ToQString(GameInfo::instance().getOrganizerDirectory()).append("\\").append(fileName)));

+  m_UpdateFile.setFileName(QDir::fromNativeSeparators(qApp->property("dataPath").toString()).append("/").append(fileName));

   m_UpdateFile.open(QIODevice::WriteOnly);

   showProgress();

 

@@ -243,7 +243,7 @@ void SelfUpdater::downloadCancel()
 

 void SelfUpdater::installUpdate()

 {

-  const QString mopath = QDir::fromNativeSeparators(ToQString(GameInfo::instance().getOrganizerDirectory()));

+  const QString mopath = QDir::fromNativeSeparators(qApp->property("dataPath").toString());

 

   QString backupPath = mopath + "/update_backup";

   QDir().mkdir(backupPath);

@@ -280,9 +280,7 @@ void SelfUpdater::installUpdate()
   }

 

   // now unpack the archive into the mo directory

-  if (!m_ArchiveHandler->extract(QString::fromStdWString(GameInfo::instance().getOrganizerDirectory()),

-         nullptr,

-         nullptr,

+  if (!m_ArchiveHandler->extract(mopath, nullptr, nullptr,

          new MethodCallback<SelfUpdater, void, QString const &>(this, &SelfUpdater::report7ZipError))) {

     throw std::runtime_error("extracting failed");

   }

@@ -418,18 +416,18 @@ void SelfUpdater::nxmFilesAvailable(int, QVariant userData, QVariant resultData,
 

   if (updateFileID != -1) {

     qDebug("update available: %d", updateFileID);

-    m_UpdateRequestID = m_Interface->requestDownloadURL(SkyrimInfo::getNexusModIDStatic(),

-                                    updateFileID, this, updateFileName,

-                                    ToQString(SkyrimInfo::getNexusInfoUrlStatic()));

+    m_UpdateRequestID = m_Interface->requestDownloadURL(m_NexusDownload->getNexusModOrganizerID(),

+                                    updateFileID, this, updateFileName, "",

+                                    m_NexusDownload);

   } else if (mainFileID != -1) {

     qDebug("full download required: %d", mainFileID);

     if (QMessageBox::question(m_Parent, tr("Update"),

             tr("No incremental update available for this version, "

                "the complete package needs to be downloaded (%1 kB)").arg(mainFileSize),

             QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok) {

-      m_UpdateRequestID = m_Interface->requestDownloadURL(SkyrimInfo::getNexusModIDStatic(),

-                                    mainFileID, this, mainFileName,

-                                    ToQString(SkyrimInfo::getNexusInfoUrlStatic()));

+      m_UpdateRequestID = m_Interface->requestDownloadURL(m_NexusDownload->getNexusModOrganizerID(),

+                                    mainFileID, this, mainFileName, "",

+                                    m_NexusDownload);

     }

   } else {

     qCritical("no file for update found");

@@ -473,3 +471,9 @@ void SelfUpdater::nxmDownloadURLsAvailable(int, int, QVariant userData, QVariant
     }

   }

 }

+

+/** Set the game check for updates */

+void SelfUpdater::setNexusDownload(MOBase::IPluginGame const *game)

+{

+  m_NexusDownload = game;

+}