kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-09-22 11:37:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Moved code across ContentManager::downloadBook() overloads

Browse Source
This commit is contained in:
Veloman Yunkan 2024-05-30 14:45:15 +04:00 committed by Kelson
parent b43607a919
commit c7295fbc05
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/contentmanager.cpp
View File

@ -232,7 +232,7 @@ void ContentManager::onCustomContextMenu(const QPoint &point)
openBook(id); openBook(id);
}); });
connect(&menuDownloadBook, &QAction::triggered, [=]() { connect(&menuDownloadBook, &QAction::triggered, [=]() {
downloadBook(id, index); downloadBook(id);
}); });
connect(&menuPauseBook, &QAction::triggered, [=]() { connect(&menuPauseBook, &QAction::triggered, [=]() {
pauseBook(id, index); pauseBook(id, index);
@ -544,11 +544,14 @@ void ContentManager::updateDownload(QString bookId, const DownloadInfo& download
} }
} }
void ContentManager::downloadBook(const QString &id, QModelIndex /*index*/) void ContentManager::downloadBook(const QString &id)
{ {
kiwix::Book book = getRemoteOrLocalBook(id);
const auto downloadPath = getSettingsManager()->getDownloadDir();
try try
{ {
downloadBook(id); downloadBook(book, downloadPath);
const auto downloadState = DownloadManager::getDownloadState(id); const auto downloadState = DownloadManager::getDownloadState(id);
managerModel->setDownloadState(id, downloadState); managerModel->setDownloadState(id, downloadState);
emit(oneBookChanged(id)); emit(oneBookChanged(id));
@ -577,11 +580,8 @@ QString ContentManager::getRemoteLibraryUrl() const
: "http://" + host + ":" + QString::number(port); : "http://" + host + ":" + QString::number(port);
} }
void ContentManager::downloadBook(const QString &id) void ContentManager::downloadBook(kiwix::Book book, const QString& downloadPath)
{ {
kiwix::Book book = getRemoteOrLocalBook(id);
const auto downloadPath = getSettingsManager()->getDownloadDir();
checkThatBookCanBeSaved(book, downloadPath); checkThatBookCanBeSaved(book, downloadPath);
std::string downloadId; std::string downloadId;

2
src/contentmanager.h
View File

@ -88,7 +88,6 @@ public slots:
void openBook(const QString& id); void openBook(const QString& id);
void openBookPreview(const QString& id); void openBookPreview(const QString& id);
void downloadBook(const QString& id); void downloadBook(const QString& id);
void downloadBook(const QString& id, QModelIndex index);
void updateLibrary(); void updateLibrary();
void setSearch(const QString& search); void setSearch(const QString& search);
void setSortBy(const QString& sortBy, const bool sortOrderAsc); void setSortBy(const QString& sortBy, const bool sortOrderAsc);
@ -124,6 +123,7 @@ private: // functions
void removeDownload(QString bookId); void removeDownload(QString bookId);
void downloadDisappeared(QString bookId); void downloadDisappeared(QString bookId);
void downloadCompleted(QString bookId, QString path); void downloadCompleted(QString bookId, QString path);
void downloadBook(kiwix::Book book, const QString& downloadPath);
private: // data private: // data
Library* mp_library; Library* mp_library;

2
src/contentmanagerdelegate.cpp
View File

@ -262,7 +262,7 @@ void ContentManagerDelegate::handleLastColumnClicked(const QModelIndex& index, Q
return contentMgr.openBook(id); return contentMgr.openBook(id);
case ContentManager::BookState::AVAILABLE_ONLINE: case ContentManager::BookState::AVAILABLE_ONLINE:
return contentMgr.downloadBook(id, index); return contentMgr.downloadBook(id);
case ContentManager::BookState::DOWNLOADING: case ContentManager::BookState::DOWNLOADING:
if ( dcl.pauseResumeButtonRect.contains(clickPoint) ) { if ( dcl.pauseResumeButtonRect.contains(clickPoint) ) {