From d53995699e6b53cf43a4eae87bd22ba4021126a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Mon, 13 Jan 2025 11:27:27 +0100 Subject: [PATCH] Add loadFromFileAsync to deckLoader and connect VisualDeckStorageWidget to it. --- .../deck_preview/deck_preview_widget.cpp | 42 ++++++++------- .../deck_preview/deck_preview_widget.h | 1 + cockatrice/src/deck/deck_loader.cpp | 51 +++++++++++++++++++ cockatrice/src/deck/deck_loader.h | 2 + 4 files changed, 79 insertions(+), 17 deletions(-) diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp index ab371bd32..abe187643 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp @@ -16,12 +16,8 @@ DeckPreviewWidget::DeckPreviewWidget(VisualDeckStorageWidget *_parent, const QSt setLayout(layout); deckLoader = new DeckLoader(); - deckLoader->loadFromFile(filePath, DeckLoader::CockatriceFormat); - - auto bannerCard = deckLoader->getBannerCard().first.isEmpty() - ? CardInfoPtr() - : CardDatabaseManager::getInstance()->getCardByNameAndProviderId( - deckLoader->getBannerCard().first, deckLoader->getBannerCard().second); + connect(deckLoader, &DeckLoader::loadFinished, this, &DeckPreviewWidget::initializeUi); + deckLoader->loadFromFileAsync(filePath, DeckLoader::CockatriceFormat, false); bannerCardDisplayWidget = new DeckPreviewCardPictureWidget(this); @@ -30,18 +26,30 @@ DeckPreviewWidget::DeckPreviewWidget(VisualDeckStorageWidget *_parent, const QSt connect(bannerCardDisplayWidget, &DeckPreviewCardPictureWidget::imageDoubleClicked, this, &DeckPreviewWidget::imageDoubleClickedEvent); - bannerCardDisplayWidget->setCard(bannerCard); - bannerCardDisplayWidget->setOverlayText( - deckLoader->getName().isEmpty() ? QFileInfo(deckLoader->getLastFileName()).fileName() : deckLoader->getName()); - bannerCardDisplayWidget->setFontSize(24); - setFilePath(deckLoader->getLastFileName()); - - colorIdentityWidget = new DeckPreviewColorIdentityWidget(getColorIdentity()); - deckTagsDisplayWidget = new DeckPreviewDeckTagsDisplayWidget(this, deckLoader); - layout->addWidget(bannerCardDisplayWidget); - layout->addWidget(colorIdentityWidget); - layout->addWidget(deckTagsDisplayWidget); +} + +void DeckPreviewWidget::initializeUi(const bool deckLoadSuccess) +{ + if (deckLoadSuccess) { + auto bannerCard = deckLoader->getBannerCard().first.isEmpty() + ? CardInfoPtr() + : CardDatabaseManager::getInstance()->getCardByNameAndProviderId( + deckLoader->getBannerCard().first, deckLoader->getBannerCard().second); + + bannerCardDisplayWidget->setCard(bannerCard); + bannerCardDisplayWidget->setOverlayText(deckLoader->getName().isEmpty() + ? QFileInfo(deckLoader->getLastFileName()).fileName() + : deckLoader->getName()); + bannerCardDisplayWidget->setFontSize(24); + setFilePath(deckLoader->getLastFileName()); + + colorIdentityWidget = new DeckPreviewColorIdentityWidget(getColorIdentity()); + deckTagsDisplayWidget = new DeckPreviewDeckTagsDisplayWidget(this, deckLoader); + + layout->addWidget(colorIdentityWidget); + layout->addWidget(deckTagsDisplayWidget); + } } QString DeckPreviewWidget::getColorIdentity() diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h index 8c9be2c8b..689c94b18 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h +++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h @@ -35,6 +35,7 @@ public slots: void setFilePath(const QString &filePath); void imageClickedEvent(QMouseEvent *event, DeckPreviewCardPictureWidget *instance); void imageDoubleClickedEvent(QMouseEvent *event, DeckPreviewCardPictureWidget *instance); + void initializeUi(bool deckLoadSuccess); }; #endif // DECK_PREVIEW_WIDGET_H diff --git a/cockatrice/src/deck/deck_loader.cpp b/cockatrice/src/deck/deck_loader.cpp index 6dd5664d4..ebe7d02ff 100644 --- a/cockatrice/src/deck/deck_loader.cpp +++ b/cockatrice/src/deck/deck_loader.cpp @@ -8,9 +8,11 @@ #include #include #include +#include #include #include #include +#include Q_LOGGING_CATEGORY(DeckLoaderLog, "deck_loader") @@ -80,6 +82,55 @@ bool DeckLoader::loadFromFile(const QString &fileName, FileFormat fmt, bool user return result; } +bool DeckLoader::loadFromFileAsync(const QString &fileName, FileFormat fmt, bool userRequest) +{ + QFutureWatcher *watcher = new QFutureWatcher(this); + + connect(watcher, &QFutureWatcher::finished, this, [this, watcher, fileName, fmt, userRequest]() { + const bool result = watcher->result(); + watcher->deleteLater(); + + if (result) { + lastFileName = fileName; + lastFileFormat = fmt; + if (userRequest) { + updateLastLoadedTimestamp(fileName, fmt); + } + emit deckLoaded(); + } + + emit loadFinished(result); + }); + + QFuture future = QtConcurrent::run([=, this]() { + QFile file(fileName); + if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { + return false; + } + + bool result = false; + switch (fmt) { + case PlainTextFormat: + result = loadFromFile_Plain(&file); + break; + case CockatriceFormat: { + result = loadFromFile_Native(&file); + if (!result) { + file.seek(0); + result = loadFromFile_Plain(&file); + } + break; + } + default: + break; + } + return result; + }); + + watcher->setFuture(future); + return true; // Return immediately to indicate the async task was started +} + bool DeckLoader::loadFromRemote(const QString &nativeString, int remoteDeckId) { bool result = loadFromString_Native(nativeString); diff --git a/cockatrice/src/deck/deck_loader.h b/cockatrice/src/deck/deck_loader.h index 741e5fe30..5d602f850 100644 --- a/cockatrice/src/deck/deck_loader.h +++ b/cockatrice/src/deck/deck_loader.h @@ -8,6 +8,7 @@ class DeckLoader : public DeckList Q_OBJECT signals: void deckLoaded(); + void loadFinished(bool success); public: enum FileFormat @@ -43,6 +44,7 @@ public: static FileFormat getFormatFromName(const QString &fileName); bool loadFromFile(const QString &fileName, FileFormat fmt, bool userRequest = false); + bool loadFromFileAsync(const QString &fileName, FileFormat fmt, bool userRequest); bool loadFromRemote(const QString &nativeString, int remoteDeckId); bool saveToFile(const QString &fileName, FileFormat fmt); bool updateLastLoadedTimestamp(const QString &fileName, FileFormat fmt);