Add unpack whole file

Update path value for pack

Author: Alvarwow69

includes/unpack/UnPackFile.hpp

@@ -8,13 +8,18 @@
 
 #include <string>
 
+#include "Chunk.hpp"
+
 namespace sw {
 
     class UnPackFile {
         public:
-            explicit UnPackFile(std::string path);
+            explicit UnPackFile(std::string path, std::string outputPath = "./");
         private:
+            std::fstream m_file;
 
+            void readChunk(std::string& outputPath);
+            void createFile(sw::chunkHeader &chunkHeader, std::string path, std::string& outputPath);
     };
 
 } // sw

sources/file/File.cpp

@@ -13,10 +13,10 @@ sw::filePackHeader sw::File::m_header{};
 
 void sw::File::createHeader()
 {
-    m_header.id[0] = 's';
-    m_header.id[1] = 'w';
-    m_header.id[2] = 'f';
-    m_header.id[3] = 'p';
+    m_header.id[0] = 'S';
+    m_header.id[1] = 'W';
+    m_header.id[2] = 'F';
+    m_header.id[3] = 'P';
     m_header.version = 100;
     m_header.fileType = DEVPACK;
 }

sources/main.cpp

@@ -15,7 +15,7 @@
 
 int main(int argc, char** argv)
 {
-    if (argc != 2) {
+    if (argc < 2) {
         std::cerr << "ERROR: Missing arguments" << std::endl;
         return 1;
     }
@@ -27,7 +27,7 @@ int main(int argc, char** argv)
     sw::Packer::startPackaging(argv[1]);
     sw::File::saveFile();
 #elif SWFP_UNPACKER
-    sw::UnPackFile file{argv[1]};
+    sw::UnPackFile file{argv[1], (argc >= 3 ? argv[2] : "./")};
 #endif
     return 0;
 }

sources/pack/Packer.cpp

@@ -47,10 +47,10 @@ void sw::Packer::createChunkData(std::string path, sw::chunkHeader& header, sw::
     file.seekg(0, std::ios::beg);
     file.read(buffer.data(), size);
 
-    data.path = (char *)std::malloc(path.size());
-    std::memset(data.path, '\0', path.size());
-    std::memcpy(data.path, path.data(), path.size());
-    data.pathCount = path.size();
+    data.path = (char *)std::malloc(path.size() - sw::Packer::path.size() + 1);
+    std::memset(data.path, '\0', path.size() - sw::Packer::path.size() + 1);
+    std::memcpy(data.path, path.data() + sw::Packer::path.size(), path.size() - sw::Packer::path.size());
+    data.pathCount = path.size() - sw::Packer::path.size();
     fillProps(data);
     data.data = std::malloc(size);
     std::memcpy(data.data, buffer.data(), size);

sources/unpack/UnPackFile.cpp

@@ -5,41 +5,57 @@
 
 #include <fstream>
 #include <iostream>
+#include <filesystem>
 
 #include "UnPackFile.hpp"
 #include "File.hpp"
-#include "Chunk.hpp"
 
-sw::UnPackFile::UnPackFile(std::string path)
+sw::UnPackFile::UnPackFile(std::string path, std::string outputPath)
 {
-    std::fstream file;
-
-    file.open(path, std::ios::binary | std::ios::in);
+    m_file.open(path, std::ios::binary | std::ios::in);
     char *buf = (char *)malloc(sizeof(filePackHeader));
 
-    file.read(buf, sizeof(filePackHeader));
+    m_file.read(buf, sizeof(filePackHeader));
+
+    std::string id = "SWFP";
+    for (int i = 0; i < 4; i++)
+        if (((filePackHeader*)buf)->id[i] != id[i]) {
+            std::cerr << "Incompatible/Corrupted file" << std::endl;
+            return;
+        }
 
-    std::cout << "Id: " << ((filePackHeader*)buf)->id << std::endl;
-    std::cout << "Version: " << ((filePackHeader*)buf)->version << std::endl;
-    std::cout << "Count: " << ((filePackHeader*)buf)->resourcesCount << std::endl << std::endl;
+    if (((filePackHeader*)buf)->version != 100) {
+        std::cerr << "Incompatible version " << ((filePackHeader*)buf)->version << " supported version: 100" << std::endl;
+        return;
+    }
 
+    for (int i = 0 ; i < ((filePackHeader*)buf)->resourcesCount; i++)
+        readChunk(outputPath);
+}
+
+void sw::UnPackFile::readChunk(std::string& outputPath)
+{
     auto *chunkHeader = (char *)malloc(sizeof(sw::chunkHeader));
     auto *chunkData = (char *)malloc(sizeof(unsigned int) * 2);
 
-    file.read(chunkHeader, sizeof(sw::chunkHeader));
-    file.read(chunkData, sizeof(unsigned int) * 2);
-    std::cout << "chunk size: " << ((sw::chunkHeader*)chunkHeader)->sizePack << std::endl;
+    m_file.read(chunkHeader, sizeof(sw::chunkHeader));
+    m_file.read(chunkData, sizeof(unsigned int) * 2);
     char *pathM = (char *)malloc(((sw::chunkData *)chunkData)->pathCount + 1);
     memset(pathM, '\0', ((sw::chunkData *)chunkData)->pathCount + 1);
-    file.read(pathM, ((sw::chunkData *)chunkData)->pathCount);
-    std::cout << "path: " << pathM << std::endl;
-
-    std::fstream outFile("./out.png", std::ios::out | std::ios::binary);
-
-    auto *buffer = (unsigned char*)malloc(((sw::chunkHeader*)chunkHeader)->sizeBase + 4);
-    memset(buffer, '\0', ((sw::chunkHeader*)chunkHeader)->sizeBase + 4);
-    file.read((char *)buffer, ((sw::chunkHeader*)chunkHeader)->sizeBase + 4);
-    outFile.write((char *)buffer, ((sw::chunkHeader*)chunkHeader)->sizeBase + 4);
-
+    m_file.read(pathM, ((sw::chunkData *)chunkData)->pathCount);
+    createFile(*(sw::chunkHeader*)chunkHeader, pathM, outputPath);
+    free(chunkHeader);
+    free(chunkData);
+    free(pathM);
+}
 
+void sw::UnPackFile::createFile(sw::chunkHeader &chunkHeader, std::string path, std::string& outputPath)
+{
+    std::filesystem::path p(outputPath + path);
+    std::filesystem::create_directories(p.parent_path());
+    auto *buffer = (unsigned char*)malloc(chunkHeader.sizeBase);
+    memset(buffer, '\0', chunkHeader.sizeBase);
+    m_file.read((char *)buffer, chunkHeader.sizeBase);
+    std::fstream outFile(outputPath + path, std::ios::out | std::ios::binary);
+    outFile.write((char *)buffer, chunkHeader.sizeBase);
 }