expose unzipper

NTNU-IHB · Oct 27, 2024 · 38799be · 38799be
1 parent 71d3004
commit 38799be
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/include/fmi4cpp/tools/unzipper.hpp b/include/fmi4cpp/tools/unzipper.hpp
@@ -0,0 +1,14 @@
+
+#ifndef FMI4CPP_UNZIPPER_HPP
+#define FMI4CPP_UNZIPPER_HPP
+
+#include <filesystem>
+
+namespace fmi4cpp
+{
+
+bool unzip(const std::filesystem::path& zip_file, const std::filesystem::path& tmp_path);
+
+} // namespace fmi4cpp
+
+#endif // FMI4CPP_UNZIPPER_HPP
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -47,6 +47,8 @@ set(publicHeaders
     "fmi4cpp/fmi2/xml/scalar_variable.hpp"
     "fmi4cpp/fmi2/xml/typed_scalar_variable.hpp"
 
+    "fmi4cpp/tools/unzipper.hpp"
+
 )
 
 set(privateHeaders
@@ -58,7 +60,6 @@ set(privateHeaders
 
     "fmi4cpp/tools/simple_id.hpp"
     "fmi4cpp/tools/os_util.hpp"
-    "fmi4cpp/tools/unzipper.hpp"
 
 )
 
@@ -82,6 +83,8 @@ set(sources
     "fmi4cpp/fmi2/xml/model_variables.cpp"
     "fmi4cpp/fmi2/xml/scalar_variable.cpp"
 
+    "fmi4cpp/tools/unzipper.cpp"
+
 )
 
 set(publicHeadersFull)

diff --git a/src/fmi4cpp/tools/unzipper.hpp → src/fmi4cpp/tools/unzipper.cpp b/src/fmi4cpp/tools/unzipper.hpp → src/fmi4cpp/tools/unzipper.cpp
@@ -1,17 +1,12 @@
 
-#ifndef FMI4CPP_UNZIPPER_HPP
-#define FMI4CPP_UNZIPPER_HPP
+#include "fmi4cpp/tools/unzipper.hpp"
 
 #include <zip.h>
 
-#include <filesystem>
 #include <fstream>
 #include <string>
 
-namespace fmi4cpp
-{
-
-inline bool unzip(const std::filesystem::path& zip_file, const std::filesystem::path& tmp_path)
+bool fmi4cpp::unzip(const std::filesystem::path& zip_file, const std::filesystem::path& tmp_path)
 {
     int* err = nullptr;
     zip* za = zip_open(absolute(zip_file).string().c_str(), 0, err);
@@ -24,7 +19,7 @@ inline bool unzip(const std::filesystem::path& zip_file, const std::filesystem::
     struct zip_stat sb{};
     // clang-format on
 
-    const int bufferSize = 1000;
+    constexpr int bufferSize = 1000;
     std::vector<char> contents(bufferSize);
     zip_int64_t sum;
     zip_int64_t len;
@@ -63,7 +58,3 @@ inline bool unzip(const std::filesystem::path& zip_file, const std::filesystem::
 
     return true;
 }
-
-} // namespace fmi4cpp
-
-#endif // FMI4CPP_UNZIPPER_HPP