From cb3bc65fcc804908cc66b1318d1ad54ef91c1d65 Mon Sep 17 00:00:00 2001
From: Veloman Yunkan <veloman.yunkan@gmail.com>
Date: Sun, 18 Feb 2024 16:00:39 +0400
Subject: [PATCH] Simpler ContentManager::getDownloadInfo()

Got rid of unneeded flexibility in ContentManager::getDownloadInfo()
---
 src/contentmanager.cpp | 33 ++++++++++-----------------------
 src/contentmanager.h   |  2 +-
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/src/contentmanager.cpp b/src/contentmanager.cpp
index 6bc33dc..6e1a7e4 100644
--- a/src/contentmanager.cpp
+++ b/src/contentmanager.cpp
@@ -385,19 +385,6 @@ QString downloadStatus2QString(kiwix::Download::StatusResult status)
     }
 }
 
-QString getDownloadInfo(const kiwix::Download& d, const QString& k)
-{
-    if (k == "id")              return QString::fromStdString(d.getDid());
-    if (k == "path")            return QString::fromStdString(d.getPath());
-    if (k == "status")          return downloadStatus2QString(d.getStatus());
-    if (k == "followedBy")      return QString::fromStdString(d.getFollowedBy());
-    if (k == "totalLength")     return QString::number(d.getTotalLength());
-    if (k == "downloadSpeed")   return QString::number(d.getDownloadSpeed());
-    if (k == "verifiedLength")  return QString::number(d.getVerifiedLength());
-    if (k == "completedLength") return QString::number(d.getCompletedLength());
-    return "";
-}
-
 } // unnamed namespace
 
 void ContentManager::downloadStarted(const kiwix::Book& book, const std::string& downloadId)
@@ -444,32 +431,32 @@ void ContentManager::downloadCompleted(QString bookId, QString path)
     }
 }
 
-DownloadInfo ContentManager::getDownloadInfo(QString bookId, const QStringList &keys) const
+DownloadInfo ContentManager::getDownloadInfo(QString bookId) const
 {
-    DownloadInfo values;
-
     auto& b = mp_library->getBookById(bookId);
     std::shared_ptr<kiwix::Download> d;
     try {
         d = mp_downloader->getDownload(b.getDownloadId());
     } catch(...) {
-        return values;
+        return {};
     }
 
     d->updateStatus(true);
 
-    for(auto& key: keys){
-        values.insert(key, ::getDownloadInfo(*d, key));
-    }
-
-    return values;
+    return {
+             { "status"          , downloadStatus2QString(d->getStatus())   },
+             { "completedLength" , QString::number(d->getCompletedLength()) },
+             { "totalLength"     , QString::number(d->getTotalLength())     },
+             { "downloadSpeed"   , QString::number(d->getDownloadSpeed())   },
+             { "path"            , QString::fromStdString(d->getPath())     }
+    };
 }
 
 void ContentManager::updateDownload(QString bookId)
 {
     const auto downloadState = m_downloads.value(bookId);
     if ( downloadState && !downloadState->paused ) {
-        const auto downloadInfo = getDownloadInfo(bookId, {"status", "completedLength", "totalLength", "downloadSpeed", "path"});
+        const auto downloadInfo = getDownloadInfo(bookId);
 
         if ( downloadInfo.isEmpty() ) {
             downloadCancelled(bookId);
diff --git a/src/contentmanager.h b/src/contentmanager.h
index 62c063c..5d5fa4c 100644
--- a/src/contentmanager.h
+++ b/src/contentmanager.h
@@ -88,7 +88,7 @@ private: // functions
     void downloadStarted(const kiwix::Book& book, const std::string& downloadId);
     void downloadCancelled(QString bookId);
     void downloadCompleted(QString bookId, QString path);
-    DownloadInfo getDownloadInfo(QString bookId, const QStringList& keys) const;
+    DownloadInfo getDownloadInfo(QString bookId) const;
 
 private: // data
     Library* mp_library;