Fix regex issues in texture path cleanup by removing whitespace chara…

…cters #49

Remove whitespace characters like \n, \r and blanks from the start and end of texture paths first.

include/NifUtil.hpp

@@ -192,6 +192,9 @@ inline bool is_relative_path(std::string_view path) noexcept {
 	}
 }
 
+// Helper to trim whitespace characters including newlines from the start and end of a string
+void trim_whitespace(std::string& str);
+
 // Convenience wrapper for std::find
 template<typename Container, typename Value = typename Container::value>
 auto find(Container& cont, Value&& val) {

src/CMakeLists.txt

@@ -31,6 +31,7 @@ set(sources
     Factory.cpp
     Geometry.cpp
     NifFile.cpp
+    NifUtil.cpp
     Nodes.cpp
     Objects.cpp
     Particles.cpp

src/NifFile.cpp

@@ -1159,6 +1159,9 @@ void NifFile::TrimTexturePaths() {
 		if (tex.empty())
 			return tex;
 
+		// Trim whitespace characters (including newlines)
+		trim_whitespace(tex);
+
 		// Replace multiple slashes or forward slashes with one backslash
 		tex = std::regex_replace(tex, std::regex("/+|\\\\+"), "\\");
 

src/NifUtil.cpp

@@ -0,0 +1,34 @@
+/*
+nifly
+C++ NIF library for the Gamebryo/NetImmerse File Format
+See the included GPLv3 LICENSE file
+*/
+
+#pragma once
+
+#include "NifUtil.hpp"
+
+namespace nifly {
+
+void trim_whitespace(std::string& str) {
+	if (str.empty())
+		return;
+
+	std::string::size_type i, j;
+	i = 0;
+
+	while (i < str.size() && isspace(str[i]))
+		++i;
+
+	if (i == str.size())
+		str.clear();
+
+	j = str.size() - 1;
+
+	while (isspace(str[j]))
+		--j;
+
+	str = str.substr(i, j - i + 1);
+}
+
+} // namespace nifly

tests/TestNifFile.cpp

@@ -39,6 +39,30 @@ TEST_CASE("Load and save static file (SE)", "[NifFile]") {
 	REQUIRE(CompareBinaryFiles(fileOutput, fileExpected));
 }
 
+TEST_CASE("Trim texture paths", "[NifFile]") {
+	constexpr auto fileName = "TestNifFile_Static_SE";
+	std::string fileInput = folderInput + "/" + fileName + nifSuffix;
+
+	NifFile nif;
+	REQUIRE(nif.Load(fileInput) == 0);
+
+	auto shapes = nif.GetShapes();
+	REQUIRE(!shapes.empty());
+
+	auto shader = nif.GetShader(shapes.front());
+	REQUIRE(shader);
+	REQUIRE(shader->HasTextureSet());
+
+	auto textureSet = nif.GetHeader().GetBlock<BSShaderTextureSet>(shader->TextureSetRef());
+	REQUIRE(textureSet);
+	REQUIRE(textureSet->textures.size() == 9);
+
+	textureSet->textures[0].get() = " \\Data\\\\Textures//white.dds\r\n  ";
+
+	nif.TrimTexturePaths();
+	REQUIRE(textureSet->textures[0] == "textures\\white.dds");
+}
+
 TEST_CASE("Load and save static file (FO4)", "[NifFile]") {
 	constexpr auto fileName = "TestNifFile_Static_FO4";
 	const auto [fileInput, fileOutput, fileExpected] = GetNifFileTuple(fileName);