Add download progress callback to ProjectDownloader

Author: adazem009

src/internal/iprojectdownloader.h

@@ -4,6 +4,7 @@
 
 #include <string>
 #include <vector>
+#include <functional>
 
 namespace libscratchcpp
 {
@@ -17,6 +18,8 @@ class IProjectDownloader
         virtual bool downloadAssets(const std::vector<std::string> &assetIds) = 0;
         virtual void cancel() = 0;
 
+        virtual void setDownloadProgressCallback(const std::function<void(unsigned int, unsigned int)> &f) = 0;
+
         virtual const std::string &json() const = 0;
         virtual const std::vector<std::string> &assets() const = 0;
         virtual unsigned int downloadedAssetCount() const = 0;

src/internal/projectdownloader.cpp

@@ -149,6 +149,13 @@ bool ProjectDownloader::downloadAssets(const std::vector<std::string> &assetIds)
                 m_assets[index] = downloader->text();
                 m_downloadedAssetCount++;
                 std::cout << "Downloaded assets: " << m_downloadedAssetCount << " of " << count << std::endl;
+
+                m_downloadProgressCallbackMutex.lock();
+
+                if (m_downloadProgressCallback)
+                    m_downloadProgressCallback(m_downloadedAssetCount, count);
+
+                m_downloadProgressCallbackMutex.unlock();
                 m_assetsMutex.unlock();
             }
         }
@@ -175,6 +182,13 @@ void ProjectDownloader::cancel()
     m_downloadedAssetCount = 0;
 }
 
+void ProjectDownloader::setDownloadProgressCallback(const std::function<void(unsigned int, unsigned int)> &f)
+{
+    m_downloadProgressCallbackMutex.lock();
+    m_downloadProgressCallback = f;
+    m_downloadProgressCallbackMutex.unlock();
+}
+
 const std::string &ProjectDownloader::json() const
 {
     return m_jsonDownloader->text();

src/internal/projectdownloader.h

@@ -23,6 +23,8 @@ class ProjectDownloader : public IProjectDownloader
         bool downloadAssets(const std::vector<std::string> &assetIds) override;
         void cancel() override;
 
+        void setDownloadProgressCallback(const std::function<void(unsigned int, unsigned int)> &f) override;
+
         const std::string &json() const override;
         const std::vector<std::string> &assets() const override;
         unsigned int downloadedAssetCount() const override;
@@ -36,6 +38,8 @@ class ProjectDownloader : public IProjectDownloader
         std::atomic<unsigned int> m_downloadedAssetCount = 0;
         bool m_cancel = false;
         std::mutex m_cancelMutex;
+        std::function<void(unsigned int, unsigned int)> m_downloadProgressCallback = nullptr;
+        std::mutex m_downloadProgressCallbackMutex;
 };
 
 } // namespace libscratchcpp