Merge branch 'master' into new_vfs_library

Conflicts:
	src/gameinfoimpl.cpp
	src/installationmanager.cpp
	src/mainwindow.cpp
	src/organizercore.cpp
	src/organizercore.h
	src/organizerproxy.cpp
	src/organizerproxy.h
	src/savegamegamebryo.cpp
	src/savegamegamebyro.h
	src/selfupdater.h
	src/shared/fallout3info.cpp
	src/shared/fallout3info.h
	src/shared/falloutnvinfo.cpp
	src/shared/falloutnvinfo.h
	src/shared/gameinfo.cpp
	src/shared/gameinfo.h
	src/shared/oblivioninfo.cpp
	src/shared/oblivioninfo.h
	src/shared/skyriminfo.cpp
	src/shared/skyriminfo.h
	src/spawn.cpp
	src/transfersavesdialog.cpp

1 files changed, 138 insertions, 26 deletions

diff --git a/src/nexusinterface.h b/src/nexusinterface.h
index c0ee50cd..c9a81134 100644
--- a/src/nexusinterface.h
+++ b/src/nexusinterface.h
@@ -20,20 +20,20 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef NEXUSINTERFACE_H

 #define NEXUSINTERFACE_H

 

-

-

 #include <utility.h>

-#include <gameinfo.h>

 #include <versioninfo.h>

 #include <imodrepositorybridge.h>

+

 #include <QNetworkReply>

 #include <QNetworkDiskCache>

 #include <QQueue>

 #include <QVariant>

 #include <QTimer>

+

 #include <list>

 #include <set>

 

+namespace MOBase { class IPluginGame; }

 

 class NexusInterface;

 class NXMAccessManager;

@@ -108,12 +108,7 @@ public slots:
 

 private:

 

-  QString url();

-

-private:

-

   NexusInterface *m_Interface;

-  QString m_Url;

   QString m_SubModule;

   std::set<int> m_RequestIDs;

 

@@ -150,26 +145,64 @@ public:
   /**

    * @brief request description for a mod

    *

+   * @param modID id of the mod caller is interested in (assumed to be for the current game)

+   * @param receiver the object to receive the result asynchronously via a signal (nxmDescriptionAvailable)

+   * @param userData user data to be returned with the result

+   * @return int an id to identify the request

+   **/

+  int requestDescription(int modID, QObject *receiver, QVariant userData, const QString &subModule)

+  {

+    return requestDescription(modID, receiver, userData, subModule, m_Game);

+  }

+

+  /**

+   * @brief request description for a mod

+   *

    * @param modID id of the mod caller is interested in

    * @param receiver the object to receive the result asynchronously via a signal (nxmDescriptionAvailable)

    * @param userData user data to be returned with the result

-   * @param url the url to request from

+   * @param game Game with which the mod is associated

    * @return int an id to identify the request

    **/

   int requestDescription(int modID, QObject *receiver, QVariant userData, const QString &subModule,

-                         const QString &url = MOBase::ToQString(MOShared::GameInfo::instance().getNexusInfoUrl()),

-                         int nexusGameId = -1);

+                         MOBase::IPluginGame const *game);

+

+  /**

+   * @brief request nexus descriptions for multiple mods at once

+   * @param modIDs a list of ids of mods the caller is interested in (assumed to be for the current game)

+   * @param receiver the object to receive the result asynchronously via a signal (nxmDescriptionAvailable)

+   * @param userData user data to be returned with the result

+   * @return int an id to identify the request

+   */

+  int requestUpdates(const std::vector<int> &modIDs, QObject *receiver, QVariant userData, const QString &subModule)

+  {

+    return requestUpdates(modIDs, receiver, userData, subModule, m_Game);

+  }

 

   /**

    * @brief request nexus descriptions for multiple mods at once

    * @param modIDs a list of ids of mods the caller is interested in

    * @param receiver the object to receive the result asynchronously via a signal (nxmDescriptionAvailable)

    * @param userData user data to be returned with the result

-   * @param url the url to request from

+   * @param game the game with which the mods are associated

    * @return int an id to identify the request

    */

   int requestUpdates(const std::vector<int> &modIDs, QObject *receiver, QVariant userData, const QString &subModule,

-                     const QString &url = MOBase::ToQString(MOShared::GameInfo::instance().getNexusInfoUrl()));

+                     MOBase::IPluginGame const *game);

+

+  /**

+   * @brief request a list of the files belonging to a mod

+   *

+   * @param modID id of the mod caller is interested in (assumed to be for the current game)

+   * @param receiver the object to receive the result asynchronously via a signal (nxmFilesAvailable)

+   * @param userData user data to be returned with the result

+   * @return int an id to identify the request

+   **/

+  int requestFiles(int modID, QObject *receiver, QVariant userData, const QString &subModule)

+  {

+    return requestFiles(modID, receiver, userData, subModule, m_Game);

+  }

+

 

   /**

    * @brief request a list of the files belonging to a mod

@@ -177,24 +210,52 @@ public:
    * @param modID id of the mod caller is interested in

    * @param receiver the object to receive the result asynchronously via a signal (nxmFilesAvailable)

    * @param userData user data to be returned with the result

-   * @param url the url to request from

+   * @param game the game with which the mods are associated

    * @return int an id to identify the request

    **/

   int requestFiles(int modID, QObject *receiver, QVariant userData, const QString &subModule,

-                   const QString &url = MOBase::ToQString(MOShared::GameInfo::instance().getNexusInfoUrl()));

+                   MOBase::IPluginGame const *game);

 

   /**

    * @brief request info about a single file of a mod

    *

-   * @param modID id of the mod caller is interested in

+   * @param modID id of the mod caller is interested in (assumed to be for the current game)

    * @param fileID id of the file the caller is interested in

    * @param receiver the object to receive the result asynchronously via a signal (nxmFilesAvailable)

    * @param userData user data to be returned with the result

-   * @param url the url to request from

+   * @return int an id to identify the request

+   **/

+  int requestFileInfo(int modID, int fileID, QObject *receiver, QVariant userData, const QString &subModule)

+  {

+    return requestFileInfo(modID, fileID, receiver, userData, subModule, m_Game);

+  }

+

+  /**

+   * @brief request info about a single file of a mod

+   *

+   * @param modID id of the mod caller is interested in (assumed to be for the current game)

+   * @param fileID id of the file the caller is interested in

+   * @param receiver the object to receive the result asynchronously via a signal (nxmFilesAvailable)

+   * @param userData user data to be returned with the result

+   * @param game the game with which the mods are associated

    * @return int an id to identify the request

    **/

   int requestFileInfo(int modID, int fileID, QObject *receiver, QVariant userData, const QString &subModule,

-                      const QString &url = MOBase::ToQString(MOShared::GameInfo::instance().getNexusInfoUrl()));

+                      MOBase::IPluginGame const *game);

+

+  /**

+   * @brief request the download url of a file

+   *

+   * @param modID id of the mod caller is interested in (assumed to be for the current game)

+   * @param fileID id of the file the caller is interested in

+   * @param receiver the object to receive the result asynchronously via a signal (nxmFilesAvailable)

+   * @param userData user data to be returned with the result

+   * @return int an id to identify the request

+   **/

+  int requestDownloadURL(int modID, int fileID, QObject *receiver, QVariant userData, const QString &subModule)

+  {

+    return requestDownloadURL(modID, fileID, receiver, userData, subModule, m_Game);

+  }

 

   /**

    * @brief request the download url of a file

@@ -203,11 +264,23 @@ public:
    * @param fileID id of the file the caller is interested in

    * @param receiver the object to receive the result asynchronously via a signal (nxmFilesAvailable)

    * @param userData user data to be returned with the result

-   * @param url the url to request from

+   * @param game the game with which the mods are associated

    * @return int an id to identify the request

    **/

-  int requestDownloadURL(int modID, int fileID, QObject *receiver, QVariant userData, const QString &subModule,

-                         const QString &url = MOBase::ToQString(MOShared::GameInfo::instance().getNexusInfoUrl()));

+  int requestDownloadURL(int modID, int fileID, QObject *receiver, QVariant userData, const QString &subModule, MOBase::IPluginGame const *game);

+

+  /**

+   * @brief toggle endorsement state of the mod

+   * @param modID id of the mod (assumed to be for the current game)

+   * @param endorse true if the mod should be endorsed, false for un-endorse

+   * @param receiver the object to receive the result asynchronously via a signal (nxmFilesAvailable)

+   * @param userData user data to be returned with the result

+   * @return int an id to identify the request

+   */

+  int requestToggleEndorsement(int modID, bool endorse, QObject *receiver, QVariant userData, const QString &subModule)

+  {

+    return requestToggleEndorsement(modID, endorse, receiver, userData, subModule, m_Game);

+  }

 

   /**

    * @brief toggle endorsement state of the mod

@@ -215,11 +288,11 @@ public:
    * @param endorse true if the mod should be endorsed, false for un-endorse

    * @param receiver the object to receive the result asynchronously via a signal (nxmFilesAvailable)

    * @param userData user data to be returned with the result

-   * @param url the url to request from

+   * @param game the game with which the mods are associated

    * @return int an id to identify the request

    */

   int requestToggleEndorsement(int modID, bool endorse, QObject *receiver, QVariant userData, const QString &subModule,

-                               const QString &url = MOBase::ToQString(MOShared::GameInfo::instance().getNexusInfoUrl()));

+                               MOBase::IPluginGame const *game);

 

   /**

    * @param directory the directory to store cache files

@@ -247,6 +320,39 @@ public:
    */

   static void interpretNexusFileName(const QString &fileName, QString &modName, int &modID, bool query);

 

+  /**

+   * @brief get the currently managed game

+   */

+  MOBase::IPluginGame const *managedGame() const;

+

+  /**

+   * @brief see if the passed URL is related to the current game

+   *

+   * Arguably, this should optionally take a gameplugin pointer

+   */

+  bool isURLGameRelated(QUrl const &url) const;

+

+  /**

+   * @brief Get the nexus page for the current game

+   *

+   * Arguably, this should optionally take a gameplugin pointer

+   */

+  QString getGameURL() const;

+

+  /**

+   * @brief Get the URL for the mod web page

+   * @param modID

+   */

+  QString getModURL(int modID) const;

+

+  /**

+   * @brief Checks if the specified URL might correspond to a nexus mod

+   * @param modID

+   * @param url

+   * @return

+   */

+  bool isModURL(int modID, QString const &url) const;

+

 signals:

 

   void requestNXMDownload(const QString &url);

@@ -261,6 +367,9 @@ signals:
   void nxmEndorsementToggled(int modID, QVariant userData, QVariant resultData, int requestID);

   void nxmRequestFailed(int modID, int fileID, QVariant userData, int requestID, const QString &errorString);

 

+public slots:

+  void managedGameChanged(MOBase::IPluginGame const *game);

+

 private slots:

 

   void requestFinished();

@@ -295,9 +404,9 @@ private:
     int m_ID;

     int m_Endorse;

 

-    NXMRequestInfo(int modID, Type type, QVariant userData, const QString &subModule, const QString &url, int nexusGameId);

-    NXMRequestInfo(std::vector<int> modIDList, Type type, QVariant userData, const QString &subModule, const QString &url, int nexusGameId);

-    NXMRequestInfo(int modID, int fileID, Type type, QVariant userData, const QString &subModule, const QString &url, int nexusGameId);

+    NXMRequestInfo(int modID, Type type, QVariant userData, const QString &subModule, MOBase::IPluginGame const *game);

+    NXMRequestInfo(std::vector<int> modIDList, Type type, QVariant userData, const QString &subModule, MOBase::IPluginGame const *game);

+    NXMRequestInfo(int modID, int fileID, Type type, QVariant userData, const QString &subModule, MOBase::IPluginGame const *game);

 

   private:

     static QAtomicInt s_NextID;

@@ -311,6 +420,7 @@ private:
   void nextRequest();

   void requestFinished(std::list<NXMRequestInfo>::iterator iter);

   bool requiresLogin(const NXMRequestInfo &info);

+  QString getOldModsURL() const;

 

 private:

 

@@ -324,6 +434,8 @@ private:
   MOBase::VersionInfo m_MOVersion;

   QString m_NMMVersion;

 

+  MOBase::IPluginGame const *m_Game;

+

 };

 

 #endif // NEXUSINTERFACE_H