From b753a47fbc716a82fa82088e0f6cb663d7857565 Mon Sep 17 00:00:00 2001
From: Veloman Yunkan <veloman.yunkan@gmail.com>
Date: Fri, 7 Jun 2024 17:19:50 +0400
Subject: [PATCH] Got rid of a ContentManager::downloadBook() overload

---
 src/contentmanager.cpp | 30 ++++++++++++------------------
 src/contentmanager.h   |  1 -
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/contentmanager.cpp b/src/contentmanager.cpp
index 4d13f58..4178b47 100644
--- a/src/contentmanager.cpp
+++ b/src/contentmanager.cpp
@@ -511,17 +511,20 @@ void ContentManager::downloadBook(const QString &id)
     kiwix::Book book = getRemoteOrLocalBook(id);
     const auto downloadPath = getSettingsManager()->getDownloadDir();
 
-    try
-    {
-        downloadBook(book, downloadPath);
-        const auto downloadState = DownloadManager::getDownloadState(id);
-        managerModel->setDownloadState(id, downloadState);
-        emit(oneBookChanged(id));
-    }
-    catch ( const KiwixAppError& err )
-    {
+    std::string downloadId;
+    try {
+        downloadId = DownloadManager::startDownload(book, downloadPath);
+    } catch ( const KiwixAppError& err ) {
         showErrorBox(err, mp_view);
+        return;
     }
+
+    book.setDownloadId(downloadId);
+    mp_library->addBookBeingDownloaded(book, downloadPath);
+    mp_library->save();
+    const auto downloadState = DownloadManager::getDownloadState(id);
+    managerModel->setDownloadState(id, downloadState);
+    emit(oneBookChanged(id));
 }
 
 const kiwix::Book& ContentManager::getRemoteOrLocalBook(const QString &id)
@@ -542,15 +545,6 @@ QString ContentManager::getRemoteLibraryUrl() const
                         : "http://" + host + ":" + QString::number(port);
 }
 
-void ContentManager::downloadBook(kiwix::Book book, const QString& downloadPath)
-{
-    const std::string downloadId = DownloadManager::startDownload(book, downloadPath);
-
-    book.setDownloadId(downloadId);
-    mp_library->addBookBeingDownloaded(book, downloadPath);
-    mp_library->save();
-}
-
 static const char MSG_FOR_PREVENTED_RMSTAR_OPERATION[] = R"(
     BUG: Errare humanum est.
     BUG: Kiwix developers are human, but we try to ensure that our mistakes
diff --git a/src/contentmanager.h b/src/contentmanager.h
index 2c43079..d214c8d 100644
--- a/src/contentmanager.h
+++ b/src/contentmanager.h
@@ -121,7 +121,6 @@ private: // functions
     void removeDownload(QString bookId);
     void downloadDisappeared(QString bookId);
     void downloadCompleted(QString bookId, QString path);
-    void downloadBook(kiwix::Book book, const QString& downloadPath);
 
 private: // data
     Library* mp_library;