From 8a6ec5fcc6cf909dd5f782a6a6ae693f1fa01fb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Wed, 31 Aug 2022 18:58:25 +0200 Subject: [PATCH] Assign covers to folders from subfolders & comics Before this commit folder with no direct comics (only subfolders) didn't have a cover image to be displayed. Now updating the children info is done recursively and subfolders are taken into account. This affects the iOS client remote browser so far, but it is also needed for the future browser update (display folders as a grid instead of using EmptyFolderWidget) --- YACReaderLibrary/db/folder_model.cpp | 6 ++- YACReaderLibrary/db_helper.cpp | 71 ++++++++++++++++++++++++---- YACReaderLibrary/db_helper.h | 3 +- YACReaderLibrary/library_creator.cpp | 7 +-- 4 files changed, 72 insertions(+), 15 deletions(-) diff --git a/YACReaderLibrary/db/folder_model.cpp b/YACReaderLibrary/db/folder_model.cpp index e362f5f1..f54fd7ea 100644 --- a/YACReaderLibrary/db/folder_model.cpp +++ b/YACReaderLibrary/db/folder_model.cpp @@ -547,7 +547,8 @@ void FolderModel::deleteFolder(const QModelIndex &mi) { QSqlDatabase db = DataBaseManagement::loadDatabase(_databasePath); DBHelper::removeFromDB(&f, db); - DBHelper::updateChildrenInfo(item->parent()->id, db); + auto folder = DBHelper::updateChildrenInfo(item->parent()->id, db); + DBHelper::propagateFolderUpdatesToParent(folder, db); connectionName = db.connectionName(); } QSqlDatabase::removeDatabase(connectionName); @@ -560,7 +561,8 @@ void FolderModel::updateFolderChildrenInfo(qulonglong folderId) QString connectionName = ""; { QSqlDatabase db = DataBaseManagement::loadDatabase(_databasePath); - DBHelper::updateChildrenInfo(folderId, db); + auto folder = DBHelper::updateChildrenInfo(folderId, db); + DBHelper::propagateFolderUpdatesToParent(folder, db); connectionName = db.connectionName(); } QSqlDatabase::removeDatabase(connectionName); diff --git a/YACReaderLibrary/db_helper.cpp b/YACReaderLibrary/db_helper.cpp index 98ba5f57..0e434ce1 100644 --- a/YACReaderLibrary/db_helper.cpp +++ b/YACReaderLibrary/db_helper.cpp @@ -727,35 +727,88 @@ void DBHelper::update(const Folder &folder, QSqlDatabase &db) updateFolderInfo.exec(); } -void DBHelper::updateChildrenInfo(qulonglong folderId, QSqlDatabase &db) +void DBHelper::propagateFolderUpdatesToParent(const Folder &folder, QSqlDatabase &db) { - QList subfolders = DBHelper::getFoldersFromParent(folderId, db, false); - QList comics = DBHelper::getComicsFromParent(folderId, db, true); + auto currentParentId = folder.parentId; + auto currentId = folder.id; + while (currentParentId != 1) { + auto f = loadFolder(currentParentId, db); + currentParentId = f.parentId; + currentId = f.id; + } - ComicDB *firstComic = NULL; - if (comics.count() > 0) - firstComic = static_cast(comics.first()); + if (currentId != folder.id) { + updateChildrenInfo(currentId, db); + } +} + +Folder DBHelper::updateChildrenInfo(qulonglong folderId, QSqlDatabase &db) +{ + auto folder = loadFolder(folderId, db); + QList subitems; + QList subfolders = DBHelper::getFoldersFromParent(folderId, db, false); + QList comics = DBHelper::getComicsFromParent(folderId, db, false); + + QList updatedSubfolders; + for (auto sf : subfolders) { + updatedSubfolders.append(new Folder(updateChildrenInfo(static_cast(sf)->id, db))); + } + + subitems.append(updatedSubfolders); + subitems.append(comics); + + std::sort(subitems.begin(), subitems.end(), naturalSortLessThanCILibraryItem); + + QString coverHash = ""; + for (auto item : subitems) { + if (item->isDir()) { + auto f = static_cast(item); + auto firstChildHash = f->getFirstChildHash(); + if (!firstChildHash.isEmpty()) { + coverHash = firstChildHash; + break; + } + } else { + auto c = static_cast(item); + coverHash = c->info.hash; + break; + } + } + + folder.setNumChildren(subfolders.count() + comics.count()); + folder.setFirstChildHash(coverHash); QSqlQuery updateFolderInfo(db); updateFolderInfo.prepare("UPDATE folder SET " "numChildren = :numChildren, " "firstChildHash = :firstChildHash " "WHERE id = :id "); - updateFolderInfo.bindValue(":numChildren", subfolders.count() + comics.count()); - updateFolderInfo.bindValue(":firstChildHash", firstComic != NULL ? firstComic->info.hash : ""); + updateFolderInfo.bindValue(":numChildren", folder.getNumChildren()); + updateFolderInfo.bindValue(":firstChildHash", folder.getFirstChildHash()); updateFolderInfo.bindValue(":id", folderId); updateFolderInfo.exec(); + + qDeleteAll(subfolders); + qDeleteAll(updatedSubfolders); + qDeleteAll(comics); + + return folder; } void DBHelper::updateChildrenInfo(QSqlDatabase &db) { + QElapsedTimer timer; + timer.start(); + QSqlQuery selectQuery(db); // TODO check - selectQuery.prepare("SELECT id FROM folder"); + selectQuery.prepare("SELECT id FROM folder f WHERE f.parentId = 1"); selectQuery.exec(); while (selectQuery.next()) { DBHelper::updateChildrenInfo(selectQuery.value(0).toULongLong(), db); } + + qDebug() << timer.elapsed(); } void DBHelper::updateProgress(qulonglong libraryId, const ComicInfo &comicInfo) diff --git a/YACReaderLibrary/db_helper.h b/YACReaderLibrary/db_helper.h index c7130769..0d552ca3 100644 --- a/YACReaderLibrary/db_helper.h +++ b/YACReaderLibrary/db_helper.h @@ -66,7 +66,8 @@ public: static void update(ComicInfo *comicInfo, QSqlDatabase &db); static void updateRead(ComicInfo *comicInfo, QSqlDatabase &db); static void update(const Folder &folder, QSqlDatabase &db); - static void updateChildrenInfo(qulonglong folderId, QSqlDatabase &db); + static void propagateFolderUpdatesToParent(const Folder &folder, QSqlDatabase &db); + static Folder updateChildrenInfo(qulonglong folderId, QSqlDatabase &db); static void updateChildrenInfo(QSqlDatabase &db); static void updateProgress(qulonglong libraryId, const ComicInfo &comicInfo); static void setComicAsReading(qulonglong libraryId, const ComicInfo &comicInfo); diff --git a/YACReaderLibrary/library_creator.cpp b/YACReaderLibrary/library_creator.cpp index afe15667..4058dd58 100644 --- a/YACReaderLibrary/library_creator.cpp +++ b/YACReaderLibrary/library_creator.cpp @@ -185,9 +185,10 @@ void LibraryCreator::run() update(QDir(_source)); } - if (partialUpdate) - DBHelper::updateChildrenInfo(folderDestinationModelIndex.data(FolderModel::IdRole).toULongLong(), _database); - else + if (partialUpdate) { + auto folder = DBHelper::updateChildrenInfo(folderDestinationModelIndex.data(FolderModel::IdRole).toULongLong(), _database); + DBHelper::propagateFolderUpdatesToParent(folder, _database); + } else DBHelper::updateChildrenInfo(_database); _database.commit();