From aff3ee8fcf427c9ff8c554a179222eabec3a95e2 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Mon, 26 Aug 2019 01:07:03 -0400
Subject: moved preferred servers into ServerList

---
 src/downloadmanager.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/downloadmanager.h')

diff --git a/src/downloadmanager.h b/src/downloadmanager.h
index feef0eaa..f739f4f0 100644
--- a/src/downloadmanager.h
+++ b/src/downloadmanager.h
@@ -20,6 +20,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef DOWNLOADMANAGER_H
 #define DOWNLOADMANAGER_H
 
+#include "serverinfo.h"
 #include <idownloadmanager.h>
 #include <modrepositoryfileinfo.h>
 #include <set>
@@ -174,9 +175,9 @@ public:
   QString getOutputDirectory() const { return m_OutputDirectory; }
 
   /**
-   * @brief setPreferredServers set the list of preferred servers
+   * @brief sets the list of servers
    */
-  void setPreferredServers(const std::map<QString, int> &preferredServers);
+  void setServers(const ServerList& servers);
 
   /**
    * @brief set the list of supported extensions
@@ -366,7 +367,9 @@ public:
    * @param RHS
    * @return
    */
-  static bool ServerByPreference(const std::map<QString, int> &preferredServers, const QVariant &LHS, const QVariant &RHS);
+  static bool ServerByPreference(
+    const QList<ServerInfo>& preferredServers,
+    const QVariant &LHS, const QVariant &RHS);
 
 
   virtual int startDownloadURLs(const QStringList &urls);
@@ -548,7 +551,7 @@ private:
   QVector<DownloadInfo*> m_ActiveDownloads;
 
   QString m_OutputDirectory;
-  std::map<QString, int> m_PreferredServers;
+  ServerList m_Servers;
   QStringList m_SupportedExtensions;
   std::set<int> m_RequestIDs;
   QVector<int> m_AlphabeticalTranslation;
-- 
cgit v1.3.1


From c42e5fb2fec9b20fe6956d8798b85874b2eff73e Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Mon, 26 Aug 2019 03:01:55 -0400
Subject: changed total speed and count to a list of the last 5 downloads
 existing servers now merged when retrieving the download links download
 manager doesn't store the servers any more, queries the settings every time

---
 src/downloadmanager.cpp     | 17 +++++------
 src/downloadmanager.h       | 17 -----------
 src/mainwindow.cpp          | 31 ++++++++++++-------
 src/organizercore.cpp       |  1 -
 src/serverinfo.cpp          | 72 +++++++++++++++++++++++++++++++++++++++------
 src/serverinfo.h            | 21 ++++++++-----
 src/settings.cpp            | 51 ++++++++++++++++++++++----------
 src/settingsdialognexus.cpp |  6 ++--
 8 files changed, 143 insertions(+), 73 deletions(-)

(limited to 'src/downloadmanager.h')

diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index 45cfdeed..93ca1608 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -288,12 +288,6 @@ void DownloadManager::setOutputDirectory(const QString &outputDirectory)
 }
 
 
-void DownloadManager::setServers(const ServerList& servers)
-{
-  m_Servers = servers;
-}
-
-
 void DownloadManager::setSupportedExtensions(const QStringList &extensions)
 {
   m_SupportedExtensions = extensions;
@@ -1669,7 +1663,7 @@ void DownloadManager::nxmFileInfoAvailable(QString gameName, int modID, int file
 
 static int evaluateFileInfoMap(
   const QVariantMap &map,
-  const QList<ServerInfo>& preferredServers)
+  const ServerList::container& preferredServers)
 {
   int preference = 0;
   bool found = false;
@@ -1692,8 +1686,9 @@ static int evaluateFileInfoMap(
 }
 
 // sort function to sort by best download server
-bool DownloadManager::ServerByPreference(
-  const QList<ServerInfo>& preferredServers,
+//
+bool ServerByPreference(
+  const ServerList::container& preferredServers,
   const QVariant &LHS, const QVariant &RHS)
 {
   const auto a = evaluateFileInfoMap(LHS.toMap(), preferredServers);
@@ -1747,10 +1742,12 @@ void DownloadManager::nxmDownloadURLsAvailable(QString gameName, int modID, int
     return;
   }
 
+  const auto servers = m_OrganizerCore->settings().getServers();
+
   std::sort(
     resultList.begin(),
     resultList.end(),
-    boost::bind(&DownloadManager::ServerByPreference, m_Servers.getPreferred(), _1, _2));
+    boost::bind(&ServerByPreference, servers.getPreferred(), _1, _2));
 
   info->userData["downloadMap"] = resultList;
 
diff --git a/src/downloadmanager.h b/src/downloadmanager.h
index f739f4f0..bed1b3cc 100644
--- a/src/downloadmanager.h
+++ b/src/downloadmanager.h
@@ -174,11 +174,6 @@ public:
    **/
   QString getOutputDirectory() const { return m_OutputDirectory; }
 
-  /**
-   * @brief sets the list of servers
-   */
-  void setServers(const ServerList& servers);
-
   /**
    * @brief set the list of supported extensions
    * @param extensions list of supported extensions
@@ -361,17 +356,6 @@ public:
    */
   void refreshList();
 
-  /**
-   * @brief Sort function for download servers
-   * @param LHS
-   * @param RHS
-   * @return
-   */
-  static bool ServerByPreference(
-    const QList<ServerInfo>& preferredServers,
-    const QVariant &LHS, const QVariant &RHS);
-
-
   virtual int startDownloadURLs(const QStringList &urls);
 
   virtual int startDownloadNexusFile(int modID, int fileID);
@@ -551,7 +535,6 @@ private:
   QVector<DownloadInfo*> m_ActiveDownloads;
 
   QString m_OutputDirectory;
-  ServerList m_Servers;
   QStringList m_SupportedExtensions;
   std::set<int> m_RequestIDs;
   QVector<int> m_AlphabeticalTranslation;
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 79203d29..4c2594b8 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -5050,7 +5050,6 @@ void MainWindow::on_actionSettings_triggered()
       dlManager->setOutputDirectory(settings.getDownloadDirectory());
     }
   }
-  dlManager->setServers(settings.getServers());
 
   if ((settings.getModDirectory() != oldModDirectory)
       || (settings.displayForeign() != oldDisplayForeign)) {
@@ -5904,20 +5903,32 @@ void MainWindow::nxmTrackedModsAvailable(QVariant userData, QVariant resultData,
 
 void MainWindow::nxmDownloadURLs(QString, int, int, QVariant, QVariant resultData, int)
 {
-  ServerList servers;
+  auto servers = m_OrganizerCore.settings().getServers();
 
   for (const QVariant &var : resultData.toList()) {
     const QVariantMap map = var.toMap();
 
-    ServerInfo server(
-      map["short_name"].toString(),
-      map["name"].toString().contains("Premium", Qt::CaseInsensitive),
-      QDate::currentDate(),
-      map["short_name"].toString().contains("CDN", Qt::CaseInsensitive) ? 1 : 0,
-      map["downloadCount"].toInt(),
-      map["downloadSpeed"].toDouble());
+    const auto name = map["short_name"].toString();
+    const auto isPremium = map["name"].toString().contains("Premium", Qt::CaseInsensitive);
+    const auto isCDN = map["short_name"].toString().contains("CDN", Qt::CaseInsensitive);
 
-    servers.add(std::move(server));
+    bool found = false;
+
+    for (auto& server : servers) {
+      if (server.name() == name) {
+        // already exists, update
+        server.setPremium(isPremium);
+        server.updateLastSeen();
+        found = true;
+        break;
+      }
+    }
+
+    if (!found) {
+      // new server
+      ServerInfo server(name, isPremium, QDate::currentDate(), isCDN ? 1 : 0, {});
+      servers.add(std::move(server));
+    }
   }
 
   m_OrganizerCore.settings().updateServers(servers);
diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 522d28be..ec13ca9c 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -276,7 +276,6 @@ OrganizerCore::OrganizerCore(Settings &settings)
   , m_PluginListsWriter(std::bind(&OrganizerCore::savePluginList, this))
 {
   m_DownloadManager.setOutputDirectory(m_Settings.getDownloadDirectory());
-  m_DownloadManager.setServers(m_Settings.getServers());
 
   NexusInterface::instance(m_PluginContainer)->setCacheDirectory(m_Settings.getCacheDirectory());
 
diff --git a/src/serverinfo.cpp b/src/serverinfo.cpp
index 16e65f52..aece61da 100644
--- a/src/serverinfo.cpp
+++ b/src/serverinfo.cpp
@@ -3,17 +3,23 @@
 
 using namespace MOBase;
 
+const std::size_t MaxDownloadCount = 5;
+
+
 ServerInfo::ServerInfo()
-  : ServerInfo({}, false, {}, 0, 0, 0.0)
+  : ServerInfo({}, false, {}, 0, {})
 {
 }
 
 ServerInfo::ServerInfo(
   QString name, bool premium, QDate last, int preferred,
-  int count, double speed) :
+  SpeedList lastDownloads) :
     m_name(std::move(name)), m_premium(premium), m_lastSeen(std::move(last)),
-    m_preferred(preferred), m_downloadCount(count), m_downloadSpeed(speed)
+    m_preferred(preferred), m_lastDownloads(std::move(lastDownloads))
 {
+  if (m_lastDownloads.size() > MaxDownloadCount) {
+    m_lastDownloads.resize(MaxDownloadCount);
+  }
 }
 
 const QString& ServerInfo::name() const
@@ -26,29 +32,77 @@ bool ServerInfo::isPremium() const
   return m_premium;
 }
 
+void ServerInfo::setPremium(bool b)
+{
+  m_premium = b;
+}
+
 const QDate& ServerInfo::lastSeen() const
 {
   return m_lastSeen;
 }
 
+void ServerInfo::updateLastSeen()
+{
+  m_lastSeen = QDate::currentDate();
+}
+
 int ServerInfo::preferred() const
 {
   return m_preferred;
 }
 
-int ServerInfo::downloadCount() const
+void ServerInfo::setPreferred(int i)
 {
-  return m_downloadCount;
+  m_preferred = i;
 }
 
-double ServerInfo::downloadSpeed() const
+const ServerInfo::SpeedList& ServerInfo::lastDownloads() const
 {
-  return m_downloadSpeed;
+  return m_lastDownloads;
 }
 
-void ServerInfo::setPreferred(int i)
+int ServerInfo::averageSpeed() const
 {
-  m_preferred = i;
+  int count = 0;
+  int total = 0;
+
+  for (const auto& s : m_lastDownloads) {
+    if (s > 0) {
+      ++count;
+      total += s;
+    }
+  }
+
+  if (count > 0) {
+    return static_cast<double>(total) / count;
+  }
+
+  return 0;
+}
+
+void ServerInfo::addDownload(int bytesPerSecond)
+{
+  if (bytesPerSecond <= 0) {
+    log::error(
+      "trying to add download with {} B/s to server '{}'; ignoring",
+      bytesPerSecond, m_name);
+
+    return;
+  }
+
+  if (m_lastDownloads.size() == MaxDownloadCount) {
+    std::rotate(
+      m_lastDownloads.begin(),
+      m_lastDownloads.begin() + 1,
+      m_lastDownloads.end());
+
+    m_lastDownloads.back() = bytesPerSecond;
+  } else {
+    m_lastDownloads.push_back(bytesPerSecond);
+  }
+
+  log::debug("added download at {} B/s to server '{}'", bytesPerSecond, m_name);
 }
 
 
diff --git a/src/serverinfo.h b/src/serverinfo.h
index c6e3b640..af8f77c8 100644
--- a/src/serverinfo.h
+++ b/src/serverinfo.h
@@ -8,27 +8,34 @@
 class ServerInfo
 {
 public:
+  using SpeedList = std::vector<int>;
+
   ServerInfo();
   ServerInfo(
     QString name, bool premium, QDate lastSeen, int preferred,
-    int downloadCount, double downloadSpeed);
+    SpeedList lastDownloads);
 
   const QString& name() const;
+
   bool isPremium() const;
+  void setPremium(bool b);
+
   const QDate& lastSeen() const;
-  int preferred() const;
-  int downloadCount() const;
-  double downloadSpeed() const;
+  void updateLastSeen();
 
+  int preferred() const;
   void setPreferred(int i);
 
+  const SpeedList& lastDownloads() const;
+  int averageSpeed() const;
+  void addDownload(int bytesPerSecond);
+
 private:
   QString m_name;
   bool m_premium;
   QDate m_lastSeen;
   int m_preferred;
-  int m_downloadCount;
-  double m_downloadSpeed;
+  SpeedList m_lastDownloads;
 };
 
 Q_DECLARE_METATYPE(ServerInfo)
@@ -37,7 +44,7 @@ Q_DECLARE_METATYPE(ServerInfo)
 class ServerList
 {
 public:
-  using container = QList<ServerInfo>;
+  using container = std::vector<ServerInfo>;
   using iterator = container::iterator;
   using const_iterator = container::const_iterator;
 
diff --git a/src/settings.cpp b/src/settings.cpp
index 3a7bda75..b11bc61c 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -850,21 +850,21 @@ void Settings::setLanguage(const QString& name)
   m_Settings.setValue("Settings/language", name);
 }
 
-void Settings::setDownloadSpeed(const QString &serverName, int bytesPerSecond)
+void Settings::setDownloadSpeed(const QString& name, int bytesPerSecond)
 {
-  m_Settings.beginGroup("Servers");
+  auto servers = getServers();
 
-  for (const QString &serverKey : m_Settings.childKeys()) {
-    QVariantMap data = m_Settings.value(serverKey).toMap();
-    if (serverKey == serverName) {
-      data["downloadCount"] = data["downloadCount"].toInt() + 1;
-      data["downloadSpeed"] = data["downloadSpeed"].toDouble() + static_cast<double>(bytesPerSecond);
-      m_Settings.setValue(serverKey, data);
+  for (auto& server : servers) {
+    if (server.name() == name) {
+      server.addDownload(bytesPerSecond);
+      updateServers(servers);
+      return;
     }
   }
 
-  m_Settings.endGroup();
-  m_Settings.sync();
+  log::error(
+    "server '{}' not found while trying to add a download with bps {}",
+    name, bytesPerSecond);
 }
 
 ServerList Settings::getServers() const
@@ -885,6 +885,7 @@ ServerList Settings::getServers() const
     return getServersFromOldMap();
   }
 
+  // post 2.2.1 format, array of values
 
   ServerList list;
 
@@ -893,13 +894,22 @@ ServerList Settings::getServers() const
   for (int i=0; i<size; ++i) {
     m_Settings.setArrayIndex(i);
 
+    ServerInfo::SpeedList lastDownloads;
+
+    const auto lastDownloadsString = m_Settings.value("lastDownloads").toString();
+    for (const auto& s : lastDownloadsString.split(" ")) {
+      const auto bytesPerSecond = s.toInt();
+      if (bytesPerSecond > 0) {
+        lastDownloads.push_back(bytesPerSecond);
+      }
+    }
+
     ServerInfo server(
       m_Settings.value("name").toString(),
       m_Settings.value("premium").toBool(),
       QDate::fromString(m_Settings.value("lastSeen").toString(), Qt::ISODate),
       m_Settings.value("preferred").toInt(),
-      m_Settings.value("downloadCount").toInt(),
-      m_Settings.value("downloadSpeed").toDouble());
+      lastDownloads);
 
     list.add(std::move(server));
   }
@@ -925,8 +935,10 @@ ServerList Settings::getServersFromOldMap() const
       data["premium"].toBool(),
       data["lastSeen"].toDate(),
       data["preferred"].toInt(),
-      data["downloadCount"].toInt(),
-      data["downloadSpeed"].toDouble());
+      {});
+
+    // ignoring download count and speed, it's now a list of values instead of
+    // a total
 
     list.add(std::move(server));
   }
@@ -955,8 +967,15 @@ void Settings::updateServers(ServerList servers)
     m_Settings.setValue("premium", server.isPremium());
     m_Settings.setValue("lastSeen", server.lastSeen().toString(Qt::ISODate));
     m_Settings.setValue("preferred", server.preferred());
-    m_Settings.setValue("downloadCount", server.downloadCount());
-    m_Settings.setValue("downloadSpeed", server.downloadSpeed());
+
+    QString lastDownloads;
+    for (const auto& speed : server.lastDownloads()) {
+      if (speed > 0) {
+        lastDownloads += QString("%1 ").arg(speed);
+      }
+    }
+
+    m_Settings.setValue("lastDownloads", lastDownloads.trimmed());
 
     ++i;
   }
diff --git a/src/settingsdialognexus.cpp b/src/settingsdialognexus.cpp
index 926ea9a6..f2bd3ab5 100644
--- a/src/settingsdialognexus.cpp
+++ b/src/settingsdialognexus.cpp
@@ -87,9 +87,9 @@ NexusSettingsTab::NexusSettingsTab(Settings& s, SettingsDialog& d)
       descriptor += QStringLiteral(" (automatic)");
     }
 
-    if (server.downloadSpeed() > 0 && server.downloadCount() > 0) {
-      const int bps = static_cast<int>(server.downloadSpeed() / server.downloadCount());
-      descriptor += QString(" (%1 kbps)").arg(bps / 1024);
+    const auto averageSpeed = server.averageSpeed();
+    if (averageSpeed > 0) {
+      descriptor += QString(" (%1 kbps)").arg(averageSpeed / 1024);
     }
 
     QListWidgetItem *newItem = new ServerItem<int>(descriptor, Qt::UserRole + 1);
-- 
cgit v1.3.1


From 8fb970faa38d808a84b1a5359462f39efbe2b37b Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Mon, 2 Dec 2019 16:59:30 -0500
Subject: fixed crash when starting multiple downloads with dialog boxes opened
 fixed download manager dialog boxes not having a parent

---
 src/downloadmanager.cpp | 31 +++++++++++++++++++++++--------
 src/downloadmanager.h   |  4 ++++
 src/organizercore.cpp   |  1 +
 3 files changed, 28 insertions(+), 8 deletions(-)

(limited to 'src/downloadmanager.h')

diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index 3143a22e..361e7164 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -200,8 +200,9 @@ QString DownloadManager::DownloadInfo::currentURL()
 }
 
 
-DownloadManager::DownloadManager(NexusInterface *nexusInterface, QObject *parent)
-  : IDownloadManager(parent), m_NexusInterface(nexusInterface), m_DirWatcher(), m_ShowHidden(false)
+DownloadManager::DownloadManager(NexusInterface *nexusInterface, QObject *parent) :
+  IDownloadManager(parent), m_NexusInterface(nexusInterface), m_DirWatcher(), m_ShowHidden(false),
+  m_ParentWidget(nullptr)
 {
   m_OrganizerCore = dynamic_cast<OrganizerCore*>(parent);
   connect(&m_DirWatcher, SIGNAL(directoryChanged(QString)), this, SLOT(directoryChanged(QString)));
@@ -219,6 +220,10 @@ DownloadManager::~DownloadManager()
   m_ActiveDownloads.clear();
 }
 
+void DownloadManager::setParentWidget(QWidget* w)
+{
+  m_ParentWidget = w;
+}
 
 bool DownloadManager::downloadsInProgress()
 {
@@ -501,7 +506,7 @@ void DownloadManager::startDownload(QNetworkReply *reply, DownloadInfo *newDownl
     if (QFile::exists(m_OutputDirectory + "/" + newDownload->m_FileName)) {
       setState(newDownload, STATE_PAUSING);
       QCoreApplication::processEvents();
-      if (QMessageBox::question(nullptr, tr("Download again?"), tr("A file with the same name \"%1\" has already been downloaded. "
+      if (QMessageBox::question(m_ParentWidget, tr("Download again?"), tr("A file with the same name \"%1\" has already been downloaded. "
           "Do you want to download it again? The new file will receive a different name.").arg(newDownload->m_FileName),
           QMessageBox::Yes | QMessageBox::No) == QMessageBox::No) {
         if (reply->isFinished())
@@ -513,7 +518,7 @@ void DownloadManager::startDownload(QNetworkReply *reply, DownloadInfo *newDownl
         newDownload->setName(getDownloadFileName(newDownload->m_FileName, true), true);
         endDisableDirWatcher();
         if (newDownload->m_State == STATE_PAUSED)
-          resumeDownload(indexByName(newDownload->m_FileName));
+          resumeDownload(indexByInfo(newDownload));
         else
           setState(newDownload, STATE_DOWNLOADING);
       }
@@ -527,7 +532,7 @@ void DownloadManager::startDownload(QNetworkReply *reply, DownloadInfo *newDownl
       newDownload->m_State != STATE_READY &&
       newDownload->m_State != STATE_FETCHINGMODINFO &&
       reply->isFinished()) {
-      downloadFinished(indexByName(newDownload->m_FileName));
+      downloadFinished(indexByInfo(newDownload));
       return;
     }
   } else
@@ -556,7 +561,7 @@ void DownloadManager::addNXMDownload(const QString &url)
   log::debug("add nxm download: {}", url);
   if (foundGame == nullptr) {
     log::debug("download requested for wrong game (game: {}, url: {})", m_ManagedGame->gameShortName(), nxmInfo.game());
-    QMessageBox::information(nullptr, tr("Wrong Game"), tr("The download link is for a mod for \"%1\" but this instance of MO "
+    QMessageBox::information(m_ParentWidget, tr("Wrong Game"), tr("The download link is for a mod for \"%1\" but this instance of MO "
     "has been set up for \"%2\".").arg(nxmInfo.game()).arg(m_ManagedGame->gameShortName()), QMessageBox::Ok);
     return;
   }
@@ -571,7 +576,7 @@ void DownloadManager::addNXMDownload(const QString &url)
         "download requested is already queued (mod: {}, file: {})",
         nxmInfo.modId(), nxmInfo.fileId());
 
-      QMessageBox::information(nullptr, tr("Already Queued"), infoStr, QMessageBox::Ok);
+      QMessageBox::information(m_ParentWidget, tr("Already Queued"), infoStr, QMessageBox::Ok);
       return;
     }
   }
@@ -615,7 +620,7 @@ void DownloadManager::addNXMDownload(const QString &url)
         }
 
         log::debug("{}", debugStr);
-        QMessageBox::information(nullptr, tr("Already Started"), infoStr, QMessageBox::Ok);
+        QMessageBox::information(m_ParentWidget, tr("Already Started"), infoStr, QMessageBox::Ok);
         return;
       }
     }
@@ -1738,6 +1743,16 @@ int DownloadManager::indexByName(const QString &fileName) const
   return -1;
 }
 
+int DownloadManager::indexByInfo(const DownloadInfo* info) const
+{
+  for (int i = 0; i < m_ActiveDownloads.size(); ++i) {
+    if (m_ActiveDownloads[i] == info) {
+      return i;
+    }
+  }
+  return -1;
+}
+
 void DownloadManager::nxmDownloadURLsAvailable(QString gameName, int modID, int fileID, QVariant userData, QVariant resultData, int requestID)
 {
   std::set<int>::iterator idIter = m_RequestIDs.find(requestID);
diff --git a/src/downloadmanager.h b/src/downloadmanager.h
index bed1b3cc..f2ad15f4 100644
--- a/src/downloadmanager.h
+++ b/src/downloadmanager.h
@@ -137,6 +137,8 @@ public:
 
   ~DownloadManager();
 
+  void setParentWidget(QWidget* w);
+
   /**
    * @brief determine if a download is currently in progress
    *
@@ -368,6 +370,7 @@ public:
    * @return index of that download or -1 if it wasn't found
    */
   int indexByName(const QString &fileName) const;
+  int indexByInfo(const DownloadInfo* info) const;
 
   void pauseAll();
 
@@ -529,6 +532,7 @@ private:
   NexusInterface *m_NexusInterface;
 
   OrganizerCore *m_OrganizerCore;
+  QWidget* m_ParentWidget;
 
   QVector<std::tuple<QString, int, int>> m_PendingDownloads;
 
diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index c585ba09..55cb82ff 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -251,6 +251,7 @@ void OrganizerCore::setUserInterface(IUserInterface* ui)
   m_InstallationManager.setParentWidget(w);
   m_Updater.setUserInterface(w);
   m_UILocker.setUserInterface(w);
+  m_DownloadManager.setParentWidget(w);
 
   checkForUpdates();
 }
-- 
cgit v1.3.1


From 2c5603092af9cdce1748870176c5f4cd49a87b8d Mon Sep 17 00:00:00 2001
From: LostDragonist <lost.dragonist@gmail.com>
Date: Fri, 6 Dec 2019 11:06:50 -0700
Subject: Add source game column to the download list

---
 src/downloadlist.cpp          |  9 ++++++++-
 src/downloadlist.h            |  1 +
 src/downloadlistsortproxy.cpp |  2 ++
 src/downloadlistwidget.cpp    |  1 +
 src/downloadmanager.cpp       | 13 +++++++++++++
 src/downloadmanager.h         |  8 ++++++++
 6 files changed, 33 insertions(+), 1 deletion(-)

(limited to 'src/downloadmanager.h')

diff --git a/src/downloadlist.cpp b/src/downloadlist.cpp
index 6957f270..99347a79 100644
--- a/src/downloadlist.cpp
+++ b/src/downloadlist.cpp
@@ -77,6 +77,7 @@ QVariant DownloadList::headerData(int section, Qt::Orientation orientation, int
       case COL_SIZE: return tr("Size");
       case COL_STATUS: return tr("Status");
       case COL_FILETIME: return tr("Filetime");
+      case COL_SOURCEGAME: return tr("Source Game");
       default: return QVariant();
     }
   } else {
@@ -118,10 +119,16 @@ QVariant DownloadList::data(const QModelIndex &index, int role) const
           if (m_Manager->isInfoIncomplete(index.row())) {
             return {};
           } else {
-            const MOBase::ModRepositoryFileInfo *info = m_Manager->getFileInfo(index.row());
             return QString("%1").arg(m_Manager->getModID(index.row()));
           }
         }
+        case COL_SOURCEGAME: {
+          if (m_Manager->isInfoIncomplete(index.row())) {
+            return {};
+          } else {
+            return QString("%1").arg(m_Manager->getDisplayGameName(index.row()));
+          }
+        }
         case COL_SIZE: return MOBase::localizedByteSize(m_Manager->getFileSize(index.row()));
         case COL_FILETIME: return m_Manager->getFileTime(index.row());
         case COL_STATUS:
diff --git a/src/downloadlist.h b/src/downloadlist.h
index 51ab4541..eb2bbc55 100644
--- a/src/downloadlist.h
+++ b/src/downloadlist.h
@@ -43,6 +43,7 @@ public:
     COL_MODNAME,
     COL_VERSION,
     COL_ID,
+    COL_SOURCEGAME,
 
     // number of columns
     COL_COUNT
diff --git a/src/downloadlistsortproxy.cpp b/src/downloadlistsortproxy.cpp
index a69993c0..6209a721 100644
--- a/src/downloadlistsortproxy.cpp
+++ b/src/downloadlistsortproxy.cpp
@@ -96,6 +96,8 @@ bool DownloadListSortProxy::lessThan(const QModelIndex &left,
       return m_Manager->getFileSize(left.row()) < m_Manager->getFileSize(right.row());
     } else if (left.column() == DownloadList::COL_FILETIME) {
       return m_Manager->getFileTime(left.row()) < m_Manager->getFileTime(right.row());
+    } else if (left.column() == DownloadList::COL_SOURCEGAME) {
+      return m_Manager->getDisplayGameName(left.row()) < m_Manager->getDisplayGameName(right.row());
     } else {
       return leftIndex < rightIndex;
     }
diff --git a/src/downloadlistwidget.cpp b/src/downloadlistwidget.cpp
index 85d27831..ac37b0ee 100644
--- a/src/downloadlistwidget.cpp
+++ b/src/downloadlistwidget.cpp
@@ -135,6 +135,7 @@ void DownloadListWidget::setManager(DownloadManager *manager)
   header()->hideSection(DownloadList::COL_MODNAME);
   header()->hideSection(DownloadList::COL_VERSION);
   header()->hideSection(DownloadList::COL_ID);
+  header()->hideSection(DownloadList::COL_SOURCEGAME);
 }
 
 void DownloadListWidget::setSourceModel(DownloadList *sourceModel)
diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index 361e7164..adfbc84d 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -1239,6 +1239,19 @@ int DownloadManager::getModID(int index) const
   return m_ActiveDownloads.at(index)->m_FileInfo->modID;
 }
 
+QString DownloadManager::getDisplayGameName(int index) const
+{
+  if ((index < 0) || (index >= m_ActiveDownloads.size())) {
+    throw MyException(tr("mod id: invalid download index %1").arg(index));
+  }
+  QString gameName = m_ActiveDownloads.at(index)->m_FileInfo->gameName;
+  IPluginGame* gamePlugin = m_OrganizerCore->getGame(gameName);
+  if (gamePlugin) {
+    gameName = gamePlugin->gameName();
+  }
+  return gameName;
+}
+
 QString DownloadManager::getGameName(int index) const
 {
   if ((index < 0) || (index >= m_ActiveDownloads.size())) {
diff --git a/src/downloadmanager.h b/src/downloadmanager.h
index f2ad15f4..4fc61cad 100644
--- a/src/downloadmanager.h
+++ b/src/downloadmanager.h
@@ -312,6 +312,14 @@ public:
    **/
   int getModID(int index) const;
 
+  /**
+   * @brief retrieve the displayable game name of the download specified by the index
+   *
+   * @param index index of the file to look up
+   * @return the displayable game name
+   **/
+  QString getDisplayGameName(int index) const;
+
   /**
    * @brief retrieve the game name of the downlaod specified by the index
    *
-- 
cgit v1.3.1