Load costume data

Author: adazem009

src/internal/scratch3reader.cpp

@@ -14,7 +14,6 @@
 
 #include "scratch3reader.h"
 #include "reader_common.h"
-#include "zipreader.h"
 
 using namespace libscratchcpp;
 using json = nlohmann::json;
@@ -211,6 +210,11 @@ bool Scratch3Reader::load()
                 costume->setRotationCenterX(jsonCostume["rotationCenterX"]);
                 READER_STEP(step, "target -> costume -> rotationCenterY");
                 costume->setRotationCenterY(jsonCostume["rotationCenterY"]);
+
+                void *data;
+                m_zipReader->readFile(costume->fileName(), &data);
+                costume->setData(static_cast<char *>(data));
+
                 target->addCostume(costume);
             }
 
@@ -360,11 +364,11 @@ std::vector<std::string> Scratch3Reader::extensions()
 void Scratch3Reader::read()
 {
     // Read project.json
-    ZipReader reader(fileName());
-    if (reader.open()) {
+    m_zipReader = std::make_unique<ZipReader>(fileName());
+    if (m_zipReader->open()) {
         // Parse the JSON
         try {
-            m_json = json::parse(reader.readFileToString("project.json"));
+            m_json = json::parse(m_zipReader->readFileToString("project.json"));
         } catch (std::exception &e) {
             printErr("invalid JSON file", e.what());
         }

src/internal/scratch3reader.h

@@ -5,6 +5,8 @@
 #include "iprojectreader.h"
 #include <nlohmann/json.hpp>
 
+#include "zipreader.h"
+
 namespace libscratchcpp
 {
 
@@ -20,6 +22,7 @@ class Scratch3Reader : public IProjectReader
 
     private:
         void read();
+        std::unique_ptr<ZipReader> m_zipReader;
         nlohmann::json m_json = "";
         std::vector<std::shared_ptr<Target>> m_targets;
         std::vector<std::shared_ptr<Broadcast>> m_broadcasts;

test/load_project/load_project_test.cpp

@@ -54,6 +54,13 @@ TEST(LoadProjectTest, EmptyProject)
         ASSERT_FALSE(backdrop->id().empty());
         ASSERT_EQ(backdrop->fileName(), backdrop->id() + ".svg");
         ASSERT_EQ(backdrop->dataFormat(), "svg");
+        ASSERT_TRUE(backdrop->data());
+        ASSERT_EQ(
+            strcmp(
+                backdrop->data(),
+                "<svg version=\"1.1\" width=\"2\" height=\"2\" viewBox=\"-1 -1 2 2\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n  <!-- Exported by Scratch - "
+                "http://scratch.mit.edu/ -->\n</svg>"),
+            0);
 
         i++;
     }