ProjectLoader: Add properties for download progress

Author: adazem009

ScratchCPPGui/projectloader.cpp

@@ -20,6 +20,18 @@ void runEventLoop(IEngine *engine)
 ProjectLoader::ProjectLoader(QObject *parent) :
     QObject(parent)
 {
+    m_project.setDownloadProgressCallback([this](unsigned int finished, unsigned int all) {
+        if (finished != m_downloadedAssets) {
+            m_downloadedAssets = finished;
+            emit downloadedAssetsChanged();
+        }
+
+        if (all != m_assetCount) {
+            m_assetCount = all;
+            emit assetCountChanged();
+        }
+    });
+
     initTimer();
 
     // Update refresh rate when primary screen changes
@@ -66,6 +78,13 @@ void ProjectLoader::setFileName(const QString &newFileName)
     m_project.setScratchVersion(ScratchVersion::Scratch3);
     m_project.setFileName(m_fileName.toStdString());
     m_loadStatus = false;
+
+    // TODO: Do not set these to 0 after libscratchcpp starts doing it itself
+    m_downloadedAssets = 0;
+    m_assetCount = 0;
+    emit downloadedAssetsChanged();
+    emit assetCountChanged();
+
     emit loadStatusChanged();
     emit fileNameChanged();
 
@@ -397,3 +416,13 @@ void ProjectLoader::setEventLoopEnabled(bool newEventLoopEnabled)
     m_engineMutex.unlock();
     emit eventLoopEnabledChanged();
 }
+
+unsigned int ProjectLoader::downloadedAssets() const
+{
+    return m_downloadedAssets;
+}
+
+unsigned int ProjectLoader::assetCount() const
+{
+    return m_assetCount;
+}

ScratchCPPGui/projectloader.h

@@ -30,6 +30,8 @@ class ProjectLoader : public QObject
         Q_PROPERTY(int cloneLimit READ cloneLimit WRITE setCloneLimit NOTIFY cloneLimitChanged)
         Q_PROPERTY(bool spriteFencing READ spriteFencing WRITE setSpriteFencing NOTIFY spriteFencingChanged)
         Q_PROPERTY(bool eventLoopEnabled READ eventLoopEnabled WRITE setEventLoopEnabled NOTIFY eventLoopEnabledChanged)
+        Q_PROPERTY(unsigned int downloadedAssets READ downloadedAssets NOTIFY downloadedAssetsChanged)
+        Q_PROPERTY(unsigned int assetCount READ assetCount NOTIFY assetCountChanged)
 
     public:
         explicit ProjectLoader(QObject *parent = nullptr);
@@ -72,6 +74,10 @@ class ProjectLoader : public QObject
         bool eventLoopEnabled() const;
         void setEventLoopEnabled(bool newEventLoopEnabled);
 
+        unsigned int downloadedAssets() const;
+
+        unsigned int assetCount() const;
+
     signals:
         void fileNameChanged();
         void loadStatusChanged();
@@ -86,6 +92,8 @@ class ProjectLoader : public QObject
         void cloneLimitChanged();
         void spriteFencingChanged();
         void eventLoopEnabledChanged();
+        void downloadedAssetsChanged();
+        void assetCountChanged();
 
     protected:
         void timerEvent(QTimerEvent *event) override;
@@ -113,6 +121,8 @@ class ProjectLoader : public QObject
         int m_cloneLimit = 300;
         bool m_spriteFencing = true;
         bool m_eventLoopEnabled = true;
+        std::atomic<unsigned int> m_downloadedAssets = 0;
+        std::atomic<unsigned int> m_assetCount = 0;
 };
 
 } // namespace scratchcppgui