kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-09-24 04:32:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1097 from kiwix/Route_de_Lausanne_107_Bourg-en-Lavaux

Browse Source 
Fixed thumbnail display for books being downloaded
This commit is contained in:
Veloman Yunkan 2024-05-04 01:02:59 +04:00 committed by GitHub
commit 904dbb40bf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/contentmanager.cpp
View File

@ -157,8 +157,7 @@ void ContentManager::restoreDownloads()
{
for ( const auto& bookId : mp_library->getBookIds() ) {
const kiwix::Book& book = mp_library->getBookById(bookId);
const QString downloadId = QString::fromStdString(book.getDownloadId());
if ( ! downloadId.isEmpty() ) {
if ( ! book.getDownloadId().empty() ) {
const auto newDownload = std::make_shared<DownloadState>();
newDownload->paused = true;
m_downloads.set(bookId, newDownload);
@ -195,7 +194,6 @@ void ContentManager::updateModel()
const auto bookIds = getBookIds();
BookInfoList bookList;
QStringList keys = {"title", "tags", "date", "id", "size", "description", "favicon"};
QIcon bookIcon;
for (auto bookId : bookIds) {
auto mp = getBookInfos(bookId, keys);
bookList.append(mp);
@ -385,7 +383,6 @@ QVariant getBookAttribute(const kiwix::Book& b, const QString& a)
if ( a == "date" ) return QString::fromStdString(b.getDate());
if ( a == "url" ) return QString::fromStdString(b.getUrl());
if ( a == "name" ) return QString::fromStdString(b.getName());
if ( a == "downloadId" ) return QString::fromStdString(b.getDownloadId());
if ( a == "favicon") return getFaviconDataOrUrl(b);
if ( a == "size" ) return QString::number(b.getSize());
if ( a == "tags" ) return getBookTags(b);
@ -397,18 +394,25 @@ QVariant getBookAttribute(const kiwix::Book& b, const QString& a)
ContentManager::BookInfo ContentManager::getBookInfos(QString id, const QStringList &keys)
{
BookInfo values;
const kiwix::Book* b = [=]()->const kiwix::Book* {
try {
return &mp_library->getBookById(id);
} catch (...) {
try {
QMutexLocker locker(&remoteLibraryLocker);
return &mp_remoteLibrary->getBookById(id.toStdString());
} catch(...) { return nullptr; }
const kiwix::Book* b = nullptr;
try {
b = &mp_library->getBookById(id);
if ( ! b->getDownloadId().empty() ) {
// The book is still being downloaded and has been entered into the
// local library for technical reasons only. Get the book info from
// the remote library.
b = nullptr;
}
}();
} catch (...) {}
if ( !b ) {
try {
QMutexLocker locker(&remoteLibraryLocker);
b = &mp_remoteLibrary->getBookById(id.toStdString());
} catch(...) {}
}
BookInfo values;
for(auto& key: keys){
values.insert(key, b ? getBookAttribute(*b, key) : "");
}
@ -419,12 +423,11 @@ ContentManager::BookInfo ContentManager::getBookInfos(QString id, const QStringL
void ContentManager::openBookWithIndex(const QModelIndex &index)
{
try {
QString bookId;
auto bookNode = static_cast<Node*>(index.internalPointer());
bookId = bookNode->getBookId();
// check if the book is available in local library, will throw std::out_of_range if it isn't.
mp_library->getBookById(bookId);
if (getBookInfos(bookId, {"downloadId"})["downloadId"] != "")
const QString bookId = bookNode->getBookId();
// throws std::out_of_range if the book isn't available in local library
const kiwix::Book& book = mp_library->getBookById(bookId);
if ( !book.getDownloadId().empty() )
return;
openBook(bookId);
} catch (std::out_of_range &e) {}
@ -445,7 +448,6 @@ void ContentManager::openBook(const QString &id)
mp_library->removeBookFromLibraryById(id);
tabBar->setCurrentIndex(0);
emit(booksChanged());
return;
}
}

3
src/contentmanagerdelegate.cpp
View File

@ -169,8 +169,7 @@ void ContentManagerDelegate::paint(QPainter *painter, const QStyleOptionViewItem
try {
const auto id = node->getBookId();
const auto book = KiwixApp::instance()->getLibrary()->getBookById(id);
if(KiwixApp::instance()->getContentManager()->getBookInfos(id, {"downloadId"})["downloadId"] != "") {
} else {
if ( book.getDownloadId().empty() ) {
button.text = gt("open");
}
} catch (std::out_of_range& e) {