From c70ab0ed0d48d483e78454b77fa4e53b9566c954 Mon Sep 17 00:00:00 2001 From: Veloman Yunkan Date: Fri, 9 Feb 2024 16:32:30 +0400 Subject: [PATCH] Unsplit download pause/resume operations Download pause/resume operations are no longer split across ContentManager and ContentManagerModel. --- src/contentmanager.cpp | 8 ++++++-- src/contentmanagermodel.cpp | 4 ---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/contentmanager.cpp b/src/contentmanager.cpp index 59b63f4..85575f4 100644 --- a/src/contentmanager.cpp +++ b/src/contentmanager.cpp @@ -574,8 +574,10 @@ void ContentManager::pauseBook(const QString& id) } auto& b = mp_library->getBookById(id); auto download = mp_downloader->getDownload(b.getDownloadId()); - if (download->getStatus() == kiwix::Download::K_ACTIVE) + if (download->getStatus() == kiwix::Download::K_ACTIVE) { download->pauseDownload(); + m_downloads[id]->pause(); + } } void ContentManager::resumeBook(const QString& id, QModelIndex index) @@ -591,8 +593,10 @@ void ContentManager::resumeBook(const QString& id) } auto& b = mp_library->getBookById(id); auto download = mp_downloader->getDownload(b.getDownloadId()); - if (download->getStatus() == kiwix::Download::K_PAUSED) + if (download->getStatus() == kiwix::Download::K_PAUSED) { download->resumeDownload(); + m_downloads[id]->resume(); + } } void ContentManager::cancelBook(const QString& id, QModelIndex index) diff --git a/src/contentmanagermodel.cpp b/src/contentmanagermodel.cpp index 3aaa81c..15f655d 100644 --- a/src/contentmanagermodel.cpp +++ b/src/contentmanagermodel.cpp @@ -298,15 +298,11 @@ void ContentManagerModel::updateDownload(QString bookId) void ContentManagerModel::pauseDownload(QModelIndex index) { - auto node = static_cast(index.internalPointer()); - node->getDownloadState()->pause(); emit dataChanged(index, index); } void ContentManagerModel::resumeDownload(QModelIndex index) { - auto node = static_cast(index.internalPointer()); - node->getDownloadState()->resume(); emit dataChanged(index, index); }