Merge branch 'lm_catch_and_prepared'

lukasmatena · lukasmatena · commit 5041c093b33e · 2025-02-20T13:16:49.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -91,13 +91,13 @@ jobs:
       shell: bash
       run: python -m build --wheel
 
-    - uses: actions/upload-artifact@v3  # upload test results
+    - uses: actions/upload-artifact@v4  # upload test results
       if: success() || failure()        # run this step even if previous step failed
       with:
-        name: test-results
+        name: test-results-linux
         path: ${{github.workspace}}/build/**/result-junit-linux.xml
     
-    - uses: actions/upload-artifact@v3  # upload python module
+    - uses: actions/upload-artifact@v4  # upload python module
       name: Saving Python artifacts
       if: success()
       with:
@@ -180,13 +180,13 @@ jobs:
         emcmake cmake .. -DBGCODE_AS_SUBPROJECT=ON -DLibBGCode_BUILD_TESTS=OFF -DCMAKE_FIND_ROOT_PATH=$(pwd)/../../deps/build-wasm/destdir/usr/local
         cmake --build .
 
-    - uses: actions/upload-artifact@v3  # upload test results
+    - uses: actions/upload-artifact@v4  # upload test results
       if: success() || failure()        # run this step even if previous step failed
       with:
-        name: test-results
+        name: test-results-wasm
         path: ${{github.workspace}}/build/**/result-junit-wasm.xml
 
-    - uses: actions/upload-artifact@v3  # upload wasm module
+    - uses: actions/upload-artifact@v4  # upload wasm module
       name: Saving WebAssembly artifacts
       if: success()
       with:
@@ -278,13 +278,13 @@ jobs:
       working-directory: ${{github.workspace}}
       run: python -m build --wheel
 
-    - uses: actions/upload-artifact@v3  # upload test results
+    - uses: actions/upload-artifact@v4  # upload test results
       if: success() || failure()        # run this step even if previous step failed
       with:
         name: test-results-msvc
         path: ${{github.workspace}}\build\**\result-junit-msvc.xml
 
-    - uses: actions/upload-artifact@v3  # upload python module
+    - uses: actions/upload-artifact@v4  # upload python module
       name: Saving Python artifacts
       if: success()
       with:
@@ -381,13 +381,13 @@ jobs:
         cmake .. -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DBGCODE_AS_SUBPROJECT=ON -DLibBGCode_BUILD_TESTS=OFF -DCMAKE_PREFIX_PATH=${{github.workspace}}/deps/build-python-module/destdir/usr/local
         cmake --build .
 
-    - uses: actions/upload-artifact@v3  # upload test results
+    - uses: actions/upload-artifact@v4  # upload test results
       if: success() || failure()        # run this step even if previous step failed
       with:
-        name: test-results
+        name: test-results-mac
         path: ${{github.workspace}}/build/**/result-junit-mac.xml
 
-    - uses: actions/upload-artifact@v3  # upload python module
+    - uses: actions/upload-artifact@v4  # upload python module
       name: Saving Python artifacts
       if: success()
       with:
diff --git a/deps/Catch2/Catch2.cmake b/deps/Catch2/Catch2.cmake
@@ -1,6 +1,7 @@
 add_cmake_project(Catch2
-    URL "https://github.com/catchorg/Catch2/archive/refs/tags/v2.13.10.zip"
-    URL_HASH SHA256=121e7488912c2ce887bfe4699ebfb983d0f2e0d68bcd60434cdfd6bb0cf78b43
+    URL "https://github.com/catchorg/Catch2/archive/refs/tags/v3.8.0.zip"
+    URL_HASH SHA256=bffd2c45a84e5a4b0c17e695798e8d2f65931cbaf5c7556d40388d1d8d04eb83
     CMAKE_ARGS
         -DCATCH_BUILD_TESTING:BOOL=OFF
+        -DCMAKE_CXX_STANDARD=17
 )
diff --git a/src/LibBGCode/convert/convert.cpp b/src/LibBGCode/convert/convert.cpp
@@ -183,6 +183,7 @@ BGCODE_CONVERT_EXPORT EResult from_ascii_to_binary(FILE& src_file, FILE& dst_fil
 {
     using namespace std::literals;
     static constexpr const std::string_view GeneratedByPrusaSlicer = "generated by PrusaSlicer"sv;
+    static constexpr const std::string_view PreparedBy = "prepared by"sv;
 
     static constexpr const std::string_view PrinterModel                        = "printer_model"sv;
     static constexpr const std::string_view FilamentType                        = "filament_type"sv;
@@ -318,6 +319,15 @@ BGCODE_CONVERT_EXPORT EResult from_ascii_to_binary(FILE& src_file, FILE& dst_fil
             return;
         }
 
+        pos = sv_line.find(PreparedBy);
+        if (lines_counter < 5 && pos != std::string_view::npos) {
+            std::string_view prep = trim(sv_line.substr(pos + PreparedBy.size()));
+            if (! prep.empty())
+                binary_data.file_metadata.raw_data.emplace_back("Prepared by", prep);
+            processed_lines.emplace_back(lines_counter++);
+            return;
+        }
+
         // collect print + printer metadata
         // to keep the proper order they will be set into binary_data later
         auto collect_metadata = [&](const std::string_view& key, std::string& value, bool shared_in_config = false) {
@@ -646,16 +656,20 @@ BGCODE_CONVERT_EXPORT EResult from_binary_to_ascii(FILE& src_file, FILE& dst_fil
 
         auto producer_it = std::find_if(file_metadata_block.raw_data.begin(), file_metadata_block.raw_data.end(),
             [](const std::pair<std::string, std::string>& item) { return item.first == "Producer"; });
-        std::string producer_str = (producer_it != file_metadata_block.raw_data.end()) ? producer_it->second : "Unknown";
-
-
+        auto prepared_it = std::find_if(file_metadata_block.raw_data.begin(), file_metadata_block.raw_data.end(),
+            [](const std::pair<std::string, std::string>& item) { return item.first == "Prepared by"; });
         auto produced_on_it = std::find_if(file_metadata_block.raw_data.begin(), file_metadata_block.raw_data.end(),
             [](const auto& item) { return item.first == "Produced on"; });
+
+        std::string producer_str = (producer_it != file_metadata_block.raw_data.end()) ? producer_it->second : "Unknown";
         if (produced_on_it != file_metadata_block.raw_data.end())
           producer_str += " on " + produced_on_it->second;
+        if (prepared_it != file_metadata_block.raw_data.end())
+          producer_str += "\n; prepared by " + prepared_it->second;
 
         if (!write_line("; generated by " + producer_str + "\n\n\n"))
             return EResult::WriteError;
+
         res = read_next_block_header(src_file, file_header, block_header, checksum_buffer.data(), checksum_buffer.size());
         if (res != EResult::Success)
             // propagate error
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(Catch2 2.9 REQUIRED)
+find_package(Catch2 3.8 REQUIRED)
 
 include(Catch)
 
@@ -16,7 +16,7 @@ file(TO_NATIVE_PATH "${TEST_DATA_DIR}" TEST_DATA_DIR)
 add_library(test_common INTERFACE)
 target_include_directories(test_common INTERFACE ${CMAKE_CURRENT_LIST_DIR})
 target_compile_definitions(test_common INTERFACE TEST_DATA_DIR=R"\(${TEST_DATA_DIR}\)" CATCH_CONFIG_FAST_COMPILE)
-target_link_libraries(test_common INTERFACE Catch2::Catch2 Boost::nowide)
+target_link_libraries(test_common INTERFACE Catch2::Catch2WithMain Boost::nowide)
 
 if (EMSCRIPTEN)
     target_link_libraries(test_common INTERFACE nodefs.js noderawfs.js)
diff --git a/tests/binarize/binarize_tests.cpp b/tests/binarize/binarize_tests.cpp
@@ -1,4 +1,9 @@
-#include <catch_main.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "binarize/binarize.hpp"
 
+TEST_CASE("Dummy", "[Binarize]")
+{
+	REQUIRE(true);
+}
+
diff --git a/tests/catch_main.hpp b/tests/catch_main.hpp
diff --git a/tests/convert/convert_tests.cpp b/tests/convert/convert_tests.cpp
@@ -1,8 +1,9 @@
-#include <catch_main.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "convert/convert.hpp"
 
 #include <fstream>
+#include <iostream>
 
 #include <boost/nowide/cstdio.hpp>
 
diff --git a/tests/core/core_tests.cpp b/tests/core/core_tests.cpp
@@ -1,9 +1,11 @@
-#include <catch_main.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include "core/core.hpp"
 
 #include <boost/nowide/cstdio.hpp>
 
+#include <iostream>
+
 using namespace bgcode::core;
 
 class ScopedFile
