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

Got rid of ContentManager::updateDownloadInfo()

Browse Source 
... by inlining it into ContentManager::updateDownload()
This commit is contained in:
Veloman Yunkan 2024-02-11 16:25:04 +04:00
parent d089dced05
commit 6f781a8e0e
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/contentmanager.cpp
View File

@ -464,27 +464,18 @@ DownloadInfo ContentManager::getDownloadInfo(QString bookId, const QStringList &
return values; return values;
} }
DownloadInfo ContentManager::updateDownloadInfos(QString bookId, QStringList keys)
{
if ( !keys.contains("status") ) keys.append("status");
if ( !keys.contains("path") ) keys.append("path");
const DownloadInfo result = getDownloadInfo(bookId, keys);
if ( result.isEmpty() ) {
downloadCancelled(bookId);
} else if ( result["status"] == "completed" ) {
downloadCompleted(bookId, result["path"].toString());
}
return result;
}
void ContentManager::updateDownload(QString bookId) void ContentManager::updateDownload(QString bookId)
{ {
const auto downloadState = m_downloads.value(bookId); const auto downloadState = m_downloads.value(bookId);
if ( downloadState && !downloadState->paused ) { if ( downloadState && !downloadState->paused ) {
const auto downloadInfo = updateDownloadInfos(bookId, {"status", "completedLength", "totalLength", "downloadSpeed"}); const auto downloadInfo = getDownloadInfo(bookId, {"status", "completedLength", "totalLength", "downloadSpeed", "path"});
if ( downloadInfo.isEmpty() ) {
downloadCancelled(bookId);
} else if ( downloadInfo["status"] == "completed" ) {
downloadCompleted(bookId, downloadInfo["path"].toString());
}
const bool downloadStillValid = downloadState->update(downloadInfo); const bool downloadStillValid = downloadState->update(downloadInfo);
if ( ! downloadStillValid ) { if ( ! downloadStillValid ) {
m_downloads.remove(bookId); m_downloads.remove(bookId);

1
src/contentmanager.h
View File

@ -49,7 +49,6 @@ public slots:
QStringList getTranslations(const QStringList &keys); QStringList getTranslations(const QStringList &keys);
BookInfo getBookInfos(QString id, const QStringList &keys); BookInfo getBookInfos(QString id, const QStringList &keys);
void openBook(const QString& id); void openBook(const QString& id);
DownloadInfo updateDownloadInfos(QString bookId, QStringList keys);
void downloadBook(const QString& id); void downloadBook(const QString& id);
void downloadBook(const QString& id, QModelIndex index); void downloadBook(const QString& id, QModelIndex index);
void updateLibrary(); void updateLibrary();