Add loadFromFileAsync to deckLoader and connect VisualDeckStorageWidget to it. (#5456)

* Add loadFromFileAsync to deckLoader and connect VisualDeckStorageWidget to it.

* Address comments.

* Lint.

* Unlint something.

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>

cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_widget.cpp

@@ -116,7 +116,7 @@ QChar DeckPreviewColorCircleWidget::getColorChar() const
     return colorChar;
 }
 
-DeckPreviewColorIdentityWidget::DeckPreviewColorIdentityWidget(const QString &colorIdentity, QWidget *parent)
+DeckPreviewColorIdentityWidget::DeckPreviewColorIdentityWidget(QWidget *parent, const QString &colorIdentity)
     : QWidget(parent)
 {
     QHBoxLayout *layout = new QHBoxLayout(this);

cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_widget.h

@@ -11,7 +11,7 @@ class DeckPreviewColorCircleWidget : public QWidget
     Q_OBJECT
 
 public:
-    explicit DeckPreviewColorCircleWidget(QChar color, QWidget *parent = nullptr);
+    explicit DeckPreviewColorCircleWidget(QChar color, QWidget *parent);
 
     void setColorActive(bool active);
     QChar getColorChar() const;
@@ -33,7 +33,7 @@ class DeckPreviewColorIdentityWidget : public QWidget
     Q_OBJECT
 
 public:
-    explicit DeckPreviewColorIdentityWidget(const QString &colorIdentity, QWidget *parent = nullptr);
+    explicit DeckPreviewColorIdentityWidget(QWidget *parent, const QString &colorIdentity);
 
 protected:
     void resizeEvent(QResizeEvent *event) override;

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,16 +26,28 @@ DeckPreviewWidget::DeckPreviewWidget(VisualDeckStorageWidget *_parent, const QSt
     connect(bannerCardDisplayWidget, &DeckPreviewCardPictureWidget::imageDoubleClicked, this,
             &DeckPreviewWidget::imageDoubleClickedEvent);
 
+    layout->addWidget(bannerCardDisplayWidget);
+}
+
+void DeckPreviewWidget::initializeUi(const bool deckLoadSuccess)
+{
+    if (!deckLoadSuccess) {
+        return;
+    }
+    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());
+    colorIdentityWidget = new DeckPreviewColorIdentityWidget(this, getColorIdentity());
     deckTagsDisplayWidget = new DeckPreviewDeckTagsDisplayWidget(this, deckLoader);
 
-    layout->addWidget(bannerCardDisplayWidget);
     layout->addWidget(colorIdentityWidget);
     layout->addWidget(deckTagsDisplayWidget);
 }

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,11 +8,10 @@
 #include <QDebug>
 #include <QFile>
 #include <QFileInfo>
+#include <QFutureWatcher>
 #include <QRegularExpression>
 #include <QStringList>
-#include <qloggingcategory.h>
+#include <QtConcurrentRun>
-
-Q_LOGGING_CATEGORY(DeckLoaderLog, "deck_loader")
 
 const QStringList DeckLoader::fileNameFilters = QStringList()
                                                 << QObject::tr("Common deck formats (*.cod *.dec *.dek *.txt *.mwDeck)")
@@ -80,6 +79,54 @@ bool DeckLoader::loadFromFile(const QString &fileName, FileFormat fmt, bool user
     return result;
 }
 
+bool DeckLoader::loadFromFileAsync(const QString &fileName, FileFormat fmt, bool userRequest)
+{
+    auto *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;
+        }
+
+        switch (fmt) {
+            case PlainTextFormat:
+                return loadFromFile_Plain(&file);
+            case CockatriceFormat: {
+                bool result = false;
+                result = loadFromFile_Native(&file);
+                if (!result) {
+                    file.seek(0);
+                    return loadFromFile_Plain(&file);
+                }
+                return result;
+            }
+            default:
+                return false;
+                break;
+        }
+    });
+
+    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

@@ -3,11 +3,16 @@
 
 #include "decklist.h"
 
-class DeckLoader : public DeckList
+#include <QLoggingCategory>
+
+inline Q_LOGGING_CATEGORY(DeckLoaderLog, "deck_loader")
+
+    class DeckLoader : public DeckList
 {
     Q_OBJECT
 signals:
     void deckLoaded();
+    void loadFinished(bool success);
 
 public:
     enum FileFormat
@@ -43,6 +48,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);