From 38c5899fef2f21561a00bd5b1df3eff8577ec986 Mon Sep 17 00:00:00 2001
From: Thomas Tanner <trtanner@btinternet.com>
Date: Wed, 25 Nov 2015 19:31:05 +0000
Subject: Replace GameInfo::getNexusInfoUrl with
 IPluginGame::getNexusManagementUrl also added getNexusDisplayUrl for the
 other variant of getNexusPage

Removed skyrim static versions

note that Nexusinterface is now passed a game plugin rather than a URL and a game ID if you want to override the current game
---
 src/selfupdater.cpp | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

(limited to 'src/selfupdater.cpp')

diff --git a/src/selfupdater.cpp b/src/selfupdater.cpp
index 7e42f322..8fb204d8 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);
     }
   }
 }
@@ -434,18 +434,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");
@@ -489,3 +489,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;
+}
-- 
cgit v1.3.1