Add Log system + logfile to packer

Add Exception to packer

Author: Alvarwow69

cmake/Packer.cmake

@@ -9,14 +9,17 @@ set( SRC_FOLDERS
         ${CMAKE_CURRENT_SOURCE_DIR}/sources/
         ${CMAKE_CURRENT_SOURCE_DIR}/sources/file/
         ${CMAKE_CURRENT_SOURCE_DIR}/sources/pack/
-        ${CMAKE_CURRENT_SOURCE_DIR}/sources/Log/
+        ${CMAKE_CURRENT_SOURCE_DIR}/sources/log/
+        ${CMAKE_CURRENT_SOURCE_DIR}/sources/exception/
+        ${CMAKE_CURRENT_SOURCE_DIR}/sources/utils/
         )
 ## INCLUDE FOLDERS
 set( INC_FOLDERS
         ${CMAKE_CURRENT_SOURCE_DIR}/includes/
         ${CMAKE_CURRENT_SOURCE_DIR}/includes/file/
         ${CMAKE_CURRENT_SOURCE_DIR}/includes/pack/
-        ${CMAKE_CURRENT_SOURCE_DIR}/includes/Log/
+        ${CMAKE_CURRENT_SOURCE_DIR}/includes/log/
+        ${CMAKE_CURRENT_SOURCE_DIR}/includes/exception/
         )
 
 ## GET SOURCES

sources/file/File.cpp

@@ -7,6 +7,8 @@
 #include <filesystem>
 
 #include "File.hpp"
+#include "FileException.hpp"
+#include "Log.hpp"
 
 std::fstream sw::File::m_file{};
 sw::filePackHeader sw::File::m_header{};
@@ -30,6 +32,8 @@ void sw::File::generateFile(std::string&& fileName, std::string&& path, bool dis
         fileName = computeFileName(fileName, path);
         m_file.open(path + fileName + ".swfp", std::ios::out | std::ios::binary);
     }
+    if (!m_file.is_open())
+        throw sw::FileException("Cannot create packed file: " + path + fileName + ".swfp");
     m_file.write(reinterpret_cast<const char *>(&m_header), sizeof(filePackHeader));
 }
 

sources/pack/Packer.cpp

@@ -10,6 +10,9 @@
 #include "Packer.hpp"
 #include "csc32.hpp"
 #include "File.hpp"
+#include "FileException.hpp"
+#include "utils.hpp"
+#include "Log.hpp"
 
 std::string sw::Packer::path{};
 
@@ -40,19 +43,19 @@ void sw::Packer::createChunkData(std::string path, sw::chunkHeader& header, sw::
 {
     std::ifstream file(path, std::ios::binary | std::ios::ate);
     if (!file.is_open())
-        throw std::exception();
+        throw sw::FileException("Cannot open target file: " + path);
     std::streamsize size = file.tellg();
     std::vector<char> buffer(size);
 
     file.seekg(0, std::ios::beg);
     file.read(buffer.data(), size);
 
-    data.path = (char *)std::malloc(path.size() - sw::Packer::path.size() + 1);
+    data.path = (char *)sw::MemAlloc(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);
+    data.data = sw::MemAlloc(size);
     std::memcpy(data.data, buffer.data(), size);
 
     header.sizeBase = size;
@@ -64,11 +67,15 @@ void sw::Packer::readFile(std::string path)
     sw::resourceChunk chunk{};
     std::filesystem::path path1(path);
 
-    fillType("RAWD", chunk.header);
-    chunk.header.id = sw::computeCsc32((unsigned char *)path1.filename().string().data(), path1.filename().string().size());
-    createChunkData(path, chunk.header, chunk.data);
-    chunk.header.crc32 = sw::computeCsc32((unsigned char *)&chunk.data, sizeof(chunk.data));
-    sw::File::writeInFile(chunk);
+    try {
+        fillType("RAWD", chunk.header);
+        chunk.header.id = sw::computeCsc32((unsigned char *) path1.filename().string().data(), path1.filename().string().size());
+        createChunkData(path, chunk.header, chunk.data);
+        chunk.header.crc32 = sw::computeCsc32((unsigned char *) &chunk.data, sizeof(chunk.data));
+        sw::File::writeInFile(chunk);
+    } catch (const std::exception& e) {
+        sw::Log::AddLog(e.what(), sw::Log::WARNING);
+    }
 }
 
 void sw::Packer::fillType(std::string &&type, sw::chunkHeader& header)

sources/unpack/UnPackFile.cpp

@@ -63,6 +63,6 @@ void sw::UnPackFile::createFile(sw::chunkHeader &chunkHeader, std::string path,
         outFile.write((char *)buffer, chunkHeader.sizeBase);
         free(buffer);
     } catch (const sw::FileException& e) {
-        sw::Log::AddLog("Cannot create file: " + path);
+        sw::Log::AddLog("Cannot create file: " + path, sw::Log::WARNING);
     }
 }