mirror of
https://github.com/kiwix/kiwix-desktop.git
synced 2025-09-24 04:32:15 -04:00
Less checks of download functionality availability
The only justified check for the availability of download functionality is in the initiation of the download action (`ContentManager::downloadBook()`) - if no download is started then (assuming otherwise correct code) it should be impossible to pause, resume or cancel one.
This commit is contained in:
parent
aa8e4c9650
commit
95290bdf0b
@ -447,12 +447,6 @@ void ContentManager::downloadCompleted(QString bookId, QString path)
|
|||||||
DownloadInfo ContentManager::getDownloadInfo(QString bookId, const QStringList &keys) const
|
DownloadInfo ContentManager::getDownloadInfo(QString bookId, const QStringList &keys) const
|
||||||
{
|
{
|
||||||
DownloadInfo values;
|
DownloadInfo values;
|
||||||
if (!mp_downloader) {
|
|
||||||
for(auto& key: keys) {
|
|
||||||
values.insert(key, "");
|
|
||||||
}
|
|
||||||
return values;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto& b = mp_library->getBookById(bookId);
|
auto& b = mp_library->getBookById(bookId);
|
||||||
std::shared_ptr<kiwix::Download> d;
|
std::shared_ptr<kiwix::Download> d;
|
||||||
@ -631,9 +625,6 @@ void ContentManager::pauseBook(const QString& id, QModelIndex index)
|
|||||||
|
|
||||||
void ContentManager::pauseBook(const QString& id)
|
void ContentManager::pauseBook(const QString& id)
|
||||||
{
|
{
|
||||||
if (!mp_downloader) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
auto& b = mp_library->getBookById(id);
|
auto& b = mp_library->getBookById(id);
|
||||||
auto download = mp_downloader->getDownload(b.getDownloadId());
|
auto download = mp_downloader->getDownload(b.getDownloadId());
|
||||||
if (download->getStatus() == kiwix::Download::K_ACTIVE) {
|
if (download->getStatus() == kiwix::Download::K_ACTIVE) {
|
||||||
@ -650,9 +641,6 @@ void ContentManager::resumeBook(const QString& id, QModelIndex index)
|
|||||||
|
|
||||||
void ContentManager::resumeBook(const QString& id)
|
void ContentManager::resumeBook(const QString& id)
|
||||||
{
|
{
|
||||||
if (!mp_downloader) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
auto& b = mp_library->getBookById(id);
|
auto& b = mp_library->getBookById(id);
|
||||||
auto download = mp_downloader->getDownload(b.getDownloadId());
|
auto download = mp_downloader->getDownload(b.getDownloadId());
|
||||||
if (download->getStatus() == kiwix::Download::K_PAUSED) {
|
if (download->getStatus() == kiwix::Download::K_PAUSED) {
|
||||||
@ -673,9 +661,6 @@ void ContentManager::cancelBook(const QString& id, QModelIndex index)
|
|||||||
|
|
||||||
void ContentManager::cancelBook(const QString& id)
|
void ContentManager::cancelBook(const QString& id)
|
||||||
{
|
{
|
||||||
if (!mp_downloader) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
auto& b = mp_library->getBookById(id);
|
auto& b = mp_library->getBookById(id);
|
||||||
auto download = mp_downloader->getDownload(b.getDownloadId());
|
auto download = mp_downloader->getDownload(b.getDownloadId());
|
||||||
if (download->getStatus() != kiwix::Download::K_COMPLETE) {
|
if (download->getStatus() != kiwix::Download::K_COMPLETE) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user