Sync with libloot v0.26.1

Aside from adding GameType::oblivionRemastered and its usage, this is almost entirely about moving C++ files and tests around.

Cargo.lock

@@ -379,9 +379,9 @@ dependencies = [
 
 [[package]]
 name = "esplugin"
-version = "6.1.2"
+version = "6.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd8b3f4507e489fce3df78273537e93e939916c83d992fbfb712db9b1f5eee62"
+checksum = "3c334f10e3dc2e21d45e208f5b6b232a6876ea6352130d90a42bdb05246f7fcc"
 dependencies = [
  "encoding_rs",
  "memchr",
@@ -528,9 +528,9 @@ dependencies = [
 
 [[package]]
 name = "libloadorder"
-version = "18.3.0"
+version = "18.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "034ffaf7bf5bd34669741500d4ccddc5dbc62c491cdb0c5e103c592da535dbeb"
+checksum = "bc4de694d488b4ce2a775d59825ec30d206546ec87fe0866717e6db25c46a164"
 dependencies = [
  "dirs",
  "encoding_rs",
@@ -545,7 +545,7 @@ dependencies = [
 
 [[package]]
 name = "libloot"
-version = "0.26.0"
+version = "0.26.1"
 dependencies = [
  "crc32fast",
  "esplugin",
@@ -566,7 +566,7 @@ dependencies = [
 
 [[package]]
 name = "libloot-cpp"
-version = "0.26.0"
+version = "0.26.1"
 dependencies = [
  "cxx",
  "cxx-build",
@@ -578,7 +578,7 @@ dependencies = [
 
 [[package]]
 name = "libloot-ffi-errors"
-version = "0.26.0"
+version = "0.26.1"
 dependencies = [
  "esplugin",
  "libloadorder",
@@ -588,7 +588,7 @@ dependencies = [
 
 [[package]]
 name = "libloot-nodejs"
-version = "0.26.0"
+version = "0.26.1"
 dependencies = [
  "libloot",
  "libloot-ffi-errors",
@@ -599,7 +599,7 @@ dependencies = [
 
 [[package]]
 name = "libloot_python"
-version = "0.26.0"
+version = "0.26.1"
 dependencies = [
  "libloot",
  "libloot-ffi-errors",
@@ -640,9 +640,9 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "loot-condition-interpreter"
-version = "5.3.1"
+version = "5.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94d58882c85aba2f4fca0951301b58e03428a8a02e51ccb0cf5f5b28d7869281"
+checksum = "eec12dc709a84442632efdc064e3463612bf7ddcc39d804de021cf56e557be04"
 dependencies = [
  "crc32fast",
  "esplugin",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libloot"
-version = "0.26.0"
+version = "0.26.1"
 edition = "2024"
 license = "GPL-3.0"
 
@@ -30,9 +30,9 @@ tempfile = "3.17.1"
 members = ["cpp", "ffi-errors", "nodejs", "parameterized-test", "python"]
 
 [workspace.dependencies]
-esplugin = "6.1.2"
-libloadorder = "18.3.0"
-loot-condition-interpreter = "5.3.1"
+esplugin = "6.1.3"
+libloadorder = "18.4.0"
+loot-condition-interpreter = "5.3.2"
 
 [profile.release]
 debug = "limited"

README.md

@@ -1,6 +1,8 @@
 # libloot-rs
 
-This is an **experimental** reimplementation of [libloot](https://github.com/loot/libloot) using Rust instead of C++, that should match libloot v0.26.0.
+This is an **experimental** reimplementation of [libloot](https://github.com/loot/libloot) using Rust instead of C++, that should match libloot v0.26.1.
+
+There is one intentional difference in behaviour: if a plugin has metadata but it is all filtered out when conditions are evaluated, getting its metadata returns `None` instead of a name-only PluginMetadata object.
 
 There are C++, Python and Node.js wrappers in the `cpp`, `python` and `nodejs` subdirectories respectively.
 

cpp/CMakeLists.txt

@@ -67,8 +67,10 @@ set(LIBLOOT_SRC_API_CPP_FILES
     "${CMAKE_SOURCE_DIR}/src/api/api.cpp"
     "${CMAKE_SOURCE_DIR}/src/api/convert.cpp"
     "${CMAKE_SOURCE_DIR}/src/api/database.cpp"
-    "${CMAKE_SOURCE_DIR}/src/api/error_categories.cpp"
-    "${CMAKE_SOURCE_DIR}/src/api/exception.cpp"
+    "${CMAKE_SOURCE_DIR}/src/api/exception/cyclic_interaction_error.cpp"
+    "${CMAKE_SOURCE_DIR}/src/api/exception/error_categories.cpp"
+    "${CMAKE_SOURCE_DIR}/src/api/exception/exception.cpp"
+    "${CMAKE_SOURCE_DIR}/src/api/exception/undefined_group_error.cpp"
     "${CMAKE_SOURCE_DIR}/src/api/metadata/conditional_metadata.cpp"
     "${CMAKE_SOURCE_DIR}/src/api/metadata/file.cpp"
     "${CMAKE_SOURCE_DIR}/src/api/metadata/filename.cpp"
@@ -81,8 +83,6 @@ set(LIBLOOT_SRC_API_CPP_FILES
     "${CMAKE_SOURCE_DIR}/src/api/metadata/tag.cpp"
     "${CMAKE_SOURCE_DIR}/src/api/game.cpp"
     "${CMAKE_SOURCE_DIR}/src/api/plugin.cpp"
-    "${CMAKE_SOURCE_DIR}/src/api/sorting/cyclic_interaction_error.cpp"
-    "${CMAKE_SOURCE_DIR}/src/api/sorting/undefined_group_error.cpp"
     "${CMAKE_SOURCE_DIR}/src/api/vertex.cpp")
 
 set(LIBLOOT_INCLUDE_H_FILES
@@ -116,7 +116,7 @@ set(LIBLOOT_INCLUDE_H_FILES
 set(LIBLOOT_SRC_API_H_FILES
     "${CMAKE_SOURCE_DIR}/src/api/convert.h"
     "${CMAKE_SOURCE_DIR}/src/api/database.h"
-    "${CMAKE_SOURCE_DIR}/src/api/exception.h"
+    "${CMAKE_SOURCE_DIR}/src/api/exception/exception.h"
     "${CMAKE_SOURCE_DIR}/src/api/game.h"
     "${CMAKE_SOURCE_DIR}/src/api/plugin.h")
 
@@ -239,7 +239,7 @@ endif()
 # Install
 ########################################
 
-set(LIBLOOT_VERSION "0.26.0")
+set(LIBLOOT_VERSION "0.26.1")
 
 set_property(TARGET loot PROPERTY VERSION ${LIBLOOT_VERSION})
 set_property(TARGET loot PROPERTY SOVERSION 0)

cpp/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libloot-cpp"
-version = "0.26.0"
+version = "0.26.1"
 edition = "2024"
 license = "GPL-3.0"
 

cpp/README.md

@@ -1,6 +1,6 @@
 # libloot-rs C++ wrapper
 
-This is an **experimental** wrapper around the Rust reimplementation of libloot that provides a C++ interface that's ABI-compatible with libloot v0.26.0.
+This is an **experimental** wrapper around the Rust reimplementation of libloot that provides a C++ interface that's ABI-compatible with libloot v0.26.1.
 
 The wrapper has two layers:
 
@@ -44,7 +44,7 @@ cmake --build build --parallel
 
 ### Tests & Packaging
 
-The build process also builds a copy of the public API tests from C++ libloot v0.26.0 by default. To skip building the tests, pass `-DLIBLOOT_BUILD_TESTS=OFF` when first running CMake.
+The build process also builds a copy of the public API tests from C++ libloot v0.26.1 by default. To skip building the tests, pass `-DLIBLOOT_BUILD_TESTS=OFF` when first running CMake.
 
 If built, the tests can be run using:
 

cpp/cmake/tests.cmake

@@ -36,16 +36,7 @@ set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_INITIAL})
 set(LIBLOOT_SRC_TESTS_INTERNALS_CPP_FILES
     "${CMAKE_SOURCE_DIR}/src/tests/api/internals/main.cpp")
 
-set(LIBLOOT_SRC_TESTS_INTERNALS_H_FILES
-    "${CMAKE_SOURCE_DIR}/src/tests/api/internals/metadata/conditional_metadata_test.h"
-    "${CMAKE_SOURCE_DIR}/src/tests/api/internals/metadata/file_test.h"
-    "${CMAKE_SOURCE_DIR}/src/tests/api/internals/metadata/group_test.h"
-    "${CMAKE_SOURCE_DIR}/src/tests/api/internals/metadata/location_test.h"
-    "${CMAKE_SOURCE_DIR}/src/tests/api/internals/metadata/message_test.h"
-    "${CMAKE_SOURCE_DIR}/src/tests/api/internals/metadata/message_content_test.h"
-    "${CMAKE_SOURCE_DIR}/src/tests/api/internals/metadata/plugin_cleaning_data_test.h"
-    "${CMAKE_SOURCE_DIR}/src/tests/api/internals/metadata/plugin_metadata_test.h"
-    "${CMAKE_SOURCE_DIR}/src/tests/api/internals/metadata/tag_test.h")
+# set(LIBLOOT_SRC_TESTS_INTERNALS_H_FILES)
 
 set(LIBLOOT_SRC_TESTS_INTERFACE_CPP_FILES
     "${CMAKE_SOURCE_DIR}/src/tests/api/interface/main.cpp")
@@ -55,15 +46,24 @@ set(LIBLOOT_SRC_TESTS_INTERFACE_H_FILES
     "${CMAKE_SOURCE_DIR}/src/tests/api/interface/create_game_handle_test.h"
     "${CMAKE_SOURCE_DIR}/src/tests/api/interface/database_interface_test.h"
     "${CMAKE_SOURCE_DIR}/src/tests/api/interface/game_interface_test.h"
-    "${CMAKE_SOURCE_DIR}/src/tests/api/interface/is_compatible_test.h")
+    "${CMAKE_SOURCE_DIR}/src/tests/api/interface/is_compatible_test.h"
+    "${CMAKE_SOURCE_DIR}/src/tests/api/interface/metadata/conditional_metadata_test.h"
+    "${CMAKE_SOURCE_DIR}/src/tests/api/interface/metadata/file_test.h"
+    "${CMAKE_SOURCE_DIR}/src/tests/api/interface/metadata/group_test.h"
+    "${CMAKE_SOURCE_DIR}/src/tests/api/interface/metadata/location_test.h"
+    "${CMAKE_SOURCE_DIR}/src/tests/api/interface/metadata/message_test.h"
+    "${CMAKE_SOURCE_DIR}/src/tests/api/interface/metadata/message_content_test.h"
+    "${CMAKE_SOURCE_DIR}/src/tests/api/interface/metadata/plugin_cleaning_data_test.h"
+    "${CMAKE_SOURCE_DIR}/src/tests/api/interface/metadata/plugin_metadata_test.h"
+    "${CMAKE_SOURCE_DIR}/src/tests/api/interface/metadata/tag_test.h")
 
 source_group(TREE "${CMAKE_SOURCE_DIR}/src/tests/api/internals"
     PREFIX "Source Files"
     FILES ${LIBLOOT_SRC_TESTS_INTERNALS_CPP_FILES})
 
-source_group(TREE "${CMAKE_SOURCE_DIR}/src/tests/api/internals"
-    PREFIX "Header Files"
-    FILES ${LIBLOOT_SRC_TESTS_INTERNALS_H_FILES})
+# source_group(TREE "${CMAKE_SOURCE_DIR}/src/tests/api/internals"
+#     PREFIX "Header Files"
+#     FILES ${LIBLOOT_SRC_TESTS_INTERNALS_H_FILES})
 
 source_group(TREE "${CMAKE_SOURCE_DIR}/src/tests/api/interface"
     PREFIX "Source Files"
@@ -77,7 +77,7 @@ source_group(TREE "${CMAKE_SOURCE_DIR}/src/tests/api/interface"
 set(LIBLOOT_INTERNALS_TESTS_ALL_SOURCES
     ${LIBLOOT_ALL_SOURCES}
     ${LIBLOOT_SRC_TESTS_INTERNALS_CPP_FILES}
-    ${LIBLOOT_SRC_TESTS_INTERNALS_H_FILES}
+    # ${LIBLOOT_SRC_TESTS_INTERNALS_H_FILES}
     "${CMAKE_SOURCE_DIR}/src/tests/common_game_test_fixture.h"
     "${CMAKE_SOURCE_DIR}/src/tests/test_helpers.h"
     "${CMAKE_SOURCE_DIR}/src/tests/printers.h")

cpp/include/loot/enum/game_type.h

@@ -52,7 +52,9 @@ enum struct GameType : unsigned int {
   /** Starfield */
   starfield,
   /** OpenMW */
-  openmw
+  openmw,
+  /** The Elder Scrolls IV: Oblivion Remastered */
+  oblivionRemastered
 };
 }
 

cpp/include/loot/loot_version.h

@@ -37,7 +37,7 @@ inline constexpr unsigned int LIBLOOT_VERSION_MAJOR = 0;
 inline constexpr unsigned int LIBLOOT_VERSION_MINOR = 26;
 
 /** @brief libloot's patch version number. */
-inline constexpr unsigned int LIBLOOT_VERSION_PATCH = 0;
+inline constexpr unsigned int LIBLOOT_VERSION_PATCH = 1;
 
 /**
  * @brief Get the library version.

cpp/src/api/convert.cpp

@@ -1,6 +1,6 @@
 #include "api/convert.h"
 
-#include "api/exception.h"
+#include "api/exception/exception.h"
 
 namespace loot {
 // To public types

cpp/src/api/database.cpp

@@ -2,7 +2,7 @@
 #include "api/database.h"
 
 #include "api/convert.h"
-#include "api/exception.h"
+#include "api/exception/exception.h"
 
 namespace loot {
 Database::Database(::rust::Box<loot::rust::Database>&& database) :

cpp/src/api/exception/exception.cpp

@@ -1,4 +1,4 @@
-#include "api/exception.h"
+#include "api/exception/exception.h"
 
 #include <charconv>
 

cpp/src/api/game.cpp

@@ -2,7 +2,7 @@
 #include "api/game.h"
 
 #include "api/convert.h"
-#include "api/exception.h"
+#include "api/exception/exception.h"
 
 namespace {
 loot::GameType convert(loot::rust::GameType gameType) {
@@ -29,6 +29,8 @@ loot::GameType convert(loot::rust::GameType gameType) {
       return loot::GameType::starfield;
     case loot::rust::GameType::OpenMW:
       return loot::GameType::openmw;
+    case loot::rust::GameType::OblivionRemastered:
+      return loot::GameType::oblivionRemastered;
     default:
       throw std::logic_error("Unsupported GameType value");
   }
@@ -58,6 +60,8 @@ loot::rust::GameType convert(loot::GameType gameType) {
       return loot::rust::GameType::Starfield;
     case loot::GameType::openmw:
       return loot::rust::GameType::OpenMW;
+    case loot::GameType::oblivionRemastered:
+      return loot::rust::GameType::OblivionRemastered;
     default:
       throw std::logic_error("Unsupported GameType value");
   }

cpp/src/api/game.h

@@ -22,7 +22,7 @@ public:
 
   GameType GetType() const override;
 
-  std::vector<std::filesystem::path> GetAdditionalDataPaths() const;
+  std::vector<std::filesystem::path> GetAdditionalDataPaths() const override;
 
   void SetAdditionalDataPaths(
       const std::vector<std::filesystem::path>& additionalDataPaths) override;

cpp/src/api/plugin.cpp

@@ -4,7 +4,7 @@
 #include <typeinfo>
 
 #include "api/convert.h"
-#include "api/exception.h"
+#include "api/exception/exception.h"
 
 namespace loot {
 Plugin::Plugin(::rust::Box<loot::rust::Plugin> plugin) :
@@ -101,9 +101,7 @@ bool Plugin::DoRecordsOverlap(const PluginInterface& plugin) const {
 
     return plugin_->do_records_overlap(*otherPlugin.plugin_);
   } catch (std::bad_cast&) {
-    throw std::invalid_argument(
-        "Tried to check if records overlapped with a different concrete type "
-        "implementing PluginInterface");
+    return false;
   } catch (const ::rust::Error& e) {
     std::rethrow_exception(mapError(e));
   }

cpp/src/api/resource.rc

@@ -13,12 +13,12 @@ BLOCK "040904b0"
 BEGIN
 VALUE "CompanyName", "LOOT"
 VALUE "FileDescription", "Library providing LOOT's core functionality"
-VALUE "FileVersion", "0.26.0"
+VALUE "FileVersion", "0.26.1"
 VALUE "InternalName", "loot"
 VALUE "LegalCopyright", "Copyright (C) 2013-2022 Oliver Hamlet"
 VALUE "OriginalFilename", "loot.dll"
 VALUE "ProductName", "LOOT"
-VALUE "ProductVersion", "0.26.0"
+VALUE "ProductVersion", "0.26.1"
 END
 END
 BLOCK "VarFileInfo"