Add loadFromFileAsync to deckLoader and connect VisualDeckStorageWidget to it.

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);
+    connect(deckLoader, &DeckLoader::loadFinished, this, &DeckPreviewWidget::initializeUi);
-
+    deckLoader->loadFromFileAsync(filePath, DeckLoader::CockatriceFormat, false);
-    auto bannerCard = deckLoader->getBannerCard().first.isEmpty()
-                          ? CardInfoPtr()
-                          : CardDatabaseManager::getInstance()->getCardByNameAndProviderId(
-                                deckLoader->getBannerCard().first, deckLoader->getBannerCard().second);
 
     bannerCardDisplayWidget = new DeckPreviewCardPictureWidget(this);
 
@@ -30,19 +26,31 @@ DeckPreviewWidget::DeckPreviewWidget(VisualDeckStorageWidget *_parent, const QSt
     connect(bannerCardDisplayWidget, &DeckPreviewCardPictureWidget::imageDoubleClicked, this,
             &DeckPreviewWidget::imageDoubleClickedEvent);
 
+    layout->addWidget(bannerCardDisplayWidget);
+}
+
+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(
+        bannerCardDisplayWidget->setOverlayText(deckLoader->getName().isEmpty()
-        deckLoader->getName().isEmpty() ? QFileInfo(deckLoader->getLastFileName()).fileName() : deckLoader->getName());
+                                                    ? 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);
     }
+}
 
 QString DeckPreviewWidget::getColorIdentity()
 {

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

cockatrice/src/deck/deck_loader.cpp

@@ -8,9 +8,11 @@
 #include <QDebug>
 #include <QFile>
 #include <QFileInfo>
+#include <QFutureWatcher>
 #include <QRegularExpression>
 #include <QStringList>
 #include <qloggingcategory.h>
+#include <qtconcurrentrun.h>
 
 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<bool> *watcher = new QFutureWatcher<bool>(this);
+
+    connect(watcher, &QFutureWatcher<bool>::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<bool> 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);

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);