wip

Author: craftablescience

ext/_ext.cmake

@@ -33,7 +33,7 @@ endif()
 
 # gdeflate
 if(SOURCEPP_USE_VPKPP)
-    add_sourcepp_remote_library(gdeflate https://github.com/craftablescience/gdeflate 315d565f65b41791eaf9504fae41f0208929f950)
+    add_sourcepp_remote_library(gdeflate https://github.com/craftablescience/gdeflate dcb637f984ece258909a451d31457896f9ecc7f5)
 endif()
 
 

include/sourcepp/parser/Text.h

@@ -81,15 +81,17 @@ using EscapeSequenceMap = std::unordered_map<char, char>;
 /**
  * Eat all whitespace after the current stream position.
  * @param stream The BufferStream to modify.
+ * @return The number of characters eaten.
  */
-void eatWhitespace(BufferStream& stream);
+uint32_t eatWhitespace(BufferStream& stream);
 
 /**
  * If a single line comment is detected, eat its contents.
  * This function does not handle the detection of single line comments!
  * @param stream The BufferStream to modify.
+ * @return The number of characters eaten.
  */
-void eatSingleLineComment(BufferStream& stream);
+uint32_t eatSingleLineComment(BufferStream& stream);
 
 /**
  * If a multi line comment is detected, eat its contents.

src/sourcepp/parser/Text.cpp

@@ -90,13 +90,21 @@ std::string parser::text::convertEscapesToSpecialChars(std::string_view str, con
 	return out;
 }
 
-void parser::text::eatWhitespace(BufferStream& stream) {
-	while (isWhitespace(stream.read<char>())) {}
+uint32_t parser::text::eatWhitespace(BufferStream& stream) {
+	uint32_t count = 0;
+	while (stream.tell() != stream.size() && isWhitespace(stream.read<char>())) {
+		count++;
+	}
 	stream.seek(-1, std::ios::cur);
+	return count;
 }
 
-void parser::text::eatSingleLineComment(BufferStream& stream) {
-	while (!isNewLine(stream.read<char>())) {}
+uint32_t parser::text::eatSingleLineComment(BufferStream& stream) {
+	uint32_t count = 0;
+	while (stream.tell() != stream.size() && !isNewLine(stream.read<char>())) {
+		count++;
+	}
+	return count;
 }
 
 void parser::text::eatMultiLineComment(BufferStream& stream, std::string_view multiLineCommentEnd) {
@@ -137,7 +145,7 @@ void parser::text::eatWhitespaceAndComments(BufferStream& stream, std::string_vi
 }
 
 bool parser::text::tryToEatChar(BufferStream& stream, char c) {
-	if (stream.peek<char>() != c) {
+	if (stream.tell() == stream.size() || stream.peek<char>() != c) {
 		return false;
 	}
 	stream.skip();

src/vpkpp/format/PKG.cpp

@@ -14,6 +14,8 @@ using namespace vpkpp;
 
 namespace {
 
+//NOLINTBEGIN(*-branch-clone)
+
 // Convert some Vulkan 1.0 formats to corresponding DXGI formats
 [[nodiscard]] constexpr uint32_t mapVkFormatToDXGIFormat(uint32_t format) {
 	switch (format) {
@@ -214,6 +216,8 @@ namespace {
 	return false;
 }
 
+//NOLINTEND(*-branch-clone)
+
 } // namespace
 
 uint32_t PKG::Asset::getBlobIndex(int frame, int face, int mip) const {
@@ -241,8 +245,10 @@ std::unique_ptr<PackFile> PKG::open(const std::string& path, const EntryCallback
 
 	if (path.length() >= 7 && string::matches(path.substr(path.length() - 7, path.length()), "_%d%d.pkg")) {
 		for (int i = 0; true; i++) {
-			const auto numberedPath = pkg->getTruncatedFilepath() + "_" + string::padNumber(i, 2) + PKG_EXTENSION.data();
-			if (!pkg->openNumbered(i, numberedPath, callback)) {
+			if (
+				const auto numberedPath = pkg->getTruncatedFilepath() + "_" + string::padNumber(i, 2) + PKG_EXTENSION.data();
+				!pkg->openNumbered(i, numberedPath, callback)
+			) {
 				if (i == 0) {
 					return nullptr;
 				}
@@ -371,8 +377,7 @@ std::optional<std::vector<std::byte>> PKG::readEntry(const std::string& path_) c
 
 	// Add blobs
 	const auto readBlob = [&stream, &blobs, &writer](uint32_t i, uint64_t blobUncompressedSize) {
-		const auto& blob = blobs[i];
-		switch (blob.compression) {
+		switch (const auto& blob = blobs[i]; blob.compression) {
 			case Blob::Compression::NONE: {
 				writer << stream.seek_in_u(blob.offset).read_bytes(blob.size);
 				break;

test/vpkpp.cpp

@@ -2,6 +2,10 @@
 
 #include <vpkpp/vpkpp.h>
 
+#include <sourcepp/parser/Text.h>
+
+#include "BufferStream.h"
+
 using namespace sourcepp;
 using namespace vpkpp;
 
@@ -27,6 +31,24 @@ TEST(vpkpp, ore_read) {
 	EXPECT_TRUE(ore->hasEntry("startup.cfg"));
 }
 
+TEST(vpkpp, pkg_read) {
+	const auto pkg = PackFile::open("/home/lxlewis/.local/share/Steam/steamapps/common/PortalRTX/rtx-remix/mods/gameReadyAssets/mod_00.pkg");
+	ASSERT_TRUE(pkg);
+	VPKPP_PRINT_ALL_PATHS(pkg);
+
+	//ASSERT_TRUE(pkg->hasEntry("SubUSDs/textures/0901F01E92F1E81C.dds"));
+	//const auto data = pkg->readEntry("SubUSDs/textures/0901F01E92F1E81C.dds");
+	//ASSERT_TRUE(data);
+	//fs::writeFileBuffer("/home/lxlewis/.local/share/Steam/steamapps/common/PortalRTX/rtx-remix/mods/gameReadyAssets/mod_spp/SubUSDs/textures/0901F01E92F1E81C.dds", *data);
+
+	ASSERT_TRUE(pkg->hasEntry("SubUSDs/textures/T_Fixture_Platform_Folding_A1_Albedo.dds"));
+	const auto data2 = pkg->readEntry("SubUSDs/textures/T_Fixture_Platform_Folding_A1_Albedo.dds");
+	ASSERT_TRUE(data2);
+	fs::writeFileBuffer("/home/lxlewis/.local/share/Steam/steamapps/common/PortalRTX/rtx-remix/mods/gameReadyAssets/mod_spp/SubUSDs/textures/T_Fixture_Platform_Folding_A1_Albedo.dds", *data2);
+
+	//ASSERT_TRUE(pkg->extractAll("/home/lxlewis/.local/share/Steam/steamapps/common/PortalRTX/rtx-remix/mods/gameReadyAssets/"));
+}
+
 TEST(vpkpp, vpp_v1_read) {
 	const auto vpp = PackFile::open(ASSET_ROOT "vpkpp/vpp/v1.vpp");
 	ASSERT_TRUE(vpp);