add support for fo4 next-gen update

Author: Ryan-rsm-McKenzie

data/fo4_next_gen_test.7z

@@ -52,6 +52,12 @@ namespace bsa::fo4
 
 		/// \brief	Intoduced in Starfield.
 		v3,
+
+		/// \brief	Intoduced in the Fallout 4 next-gen update.
+		v7 = 7,
+
+		/// \brief	Intoduced in the Fallout 4 next-gen update.
+		v8,
 	};
 
 	/// \brief	Specifies the compression level to use when compressing data.

include/bsa/fo4.hpp

@@ -106,23 +106,18 @@ namespace bsa::fo4
 			[[nodiscard]] auto sizeof_header(version a_version) noexcept
 				-> std::size_t
 			{
-				std::size_t size = 0;
-
 				switch (a_version) {
-				case version::v3:
-					size += sizeof(std::uint32_t);
-					[[fallthrough]];
-				case version::v2:
-					size += sizeof(std::uint64_t);
-					[[fallthrough]];
 				case version::v1:
-					size += 0x18;
-					break;
+				case version::v7:
+				case version::v8:
+					return 0x18;
+				case version::v2:
+					return 0x20;
+				case version::v3:
+					return 0x24;
 				default:
 					detail::declare_unreachable();
 				}
-
-				return size;
 			}
 		}
 
@@ -141,7 +136,7 @@ namespace bsa::fo4
 				_stringTableOffset(a_stringTableOffset),
 				_compression_format(a_meta.compression_format_)
 			{
-				if (a_meta.compression_format_ == compression_format::lz4 && a_meta.version_ < version::v3) {
+				if (a_meta.compression_format_ == compression_format::lz4 && a_meta.version_ != version::v3) {
 					throw exception("compression format is not valid for the given version");
 				}
 			}
@@ -170,17 +165,19 @@ namespace bsa::fo4
 					case 1:
 					case 2:
 					case 3:
+					case 7:
+					case 8:
 						break;
 					default:
 						throw exception("invalid version");
 					}
 				}
 
-				if (a_header._version >= 2) {
+				if (a_header._version == 2 || a_header._version == 3) {
 					(void)a_in->read<std::uint64_t>();
 				}
 
-				if (a_header._version >= 3) {
+				if (a_header._version == 3) {
 					const auto [compression] = a_in->read<std::uint32_t>();
 					if (compression == constants::compression_lz4) {
 						a_header._compression_format = fo4::compression_format::lz4;
@@ -202,11 +199,11 @@ namespace bsa::fo4
 					a_header._fileCount,
 					a_header._stringTableOffset);
 
-				if (a_header._version >= 2) {
+				if (a_header._version == 2 || a_header._version == 3) {
 					a_out.write(std::uint64_t{ 1 });
 				}
 
-				if (a_header._version >= 3) {
+				if (a_header._version == 3) {
 					std::uint32_t format =
 						a_header._compression_format == fo4::compression_format::lz4 ?
 							constants::compression_lz4 :

src/bsa/fo4.cpp

@@ -62,6 +62,7 @@ acquire_test("fo4_dds_test")
 acquire_test("fo4_dx9_test")
 acquire_test("fo4_invalid_test")
 acquire_test("fo4_missing_string_table_test")
+acquire_test("fo4_next_gen_test")
 acquire_test("fo4_write_test")
 
 acquire_test("tes3_invalid_test")

tests/CMakeLists.txt

@@ -618,4 +618,51 @@ TEST_CASE("bsa::fo4::archive", "[src][fo4][archive]")
 				});
 		}
 	}
+
+	SECTION("we can archives from the fallout 4 next-gen update")
+	{
+		const std::filesystem::path root{ "fo4_next_gen_test"sv };
+		const std::array formats = {
+			std::make_pair(bsa::fo4::format::directx, "dx10"sv),
+			std::make_pair(bsa::fo4::format::general, "gnrl"sv),
+		};
+		const std::array versions = { bsa::fo4::version::v7, bsa::fo4::version::v8 };
+
+		for (const auto [format, format_str] : formats) {
+			for (const auto version : versions) {
+				std::span<const std::string_view> files;
+				switch (format) {
+				case bsa::fo4::format::general:
+					{
+						constexpr std::array a = { "License.txt"sv, "SampleA.png"sv };
+						files = std::span(a);
+					}
+					break;
+				case bsa::fo4::format::directx:
+					{
+						constexpr std::array a = { "Fence006_1K_Roughness.dds"sv };
+						files = std::span(a);
+					}
+					break;
+				default:
+					REQUIRE(false);
+				}
+
+				bsa::fo4::archive ba2;
+				const auto path = root / std::format("{}_v{}.ba2", format_str, static_cast<std::uint32_t>(version));
+				const auto meta = ba2.read(path);
+				REQUIRE(meta.version_ == version);
+				REQUIRE(meta.format_ == format);
+
+				REQUIRE(ba2.size() == files.size());
+				for (const auto filename : files) {
+					const auto file = ba2[filename];
+					REQUIRE(static_cast<bool>(file));
+				}
+
+				auto os = binary_io::any_ostream(std::in_place_type<binary_io::memory_ostream>);
+				ba2.write({ os }, meta);
+			}
+		}
+	}
 }