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/serverinfo.cpp | 72 +++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 63 insertions(+), 9 deletions(-)

(limited to 'src/serverinfo.cpp')

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);
 }
 
 
-- 
cgit v1.3.1