Move GetCaseInsensitiveFullPath() to RTETools

Remove vestigial #include

Author: MyNameIsTrez

Source/Managers/LuaMan.cpp

@@ -939,42 +939,6 @@ namespace RTE {
 		return stackDescription.str();
 	}
 
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-	// TODO: Ask Causeless whether this is an appropriate spot for this method
-	std::string LuaMan::GetCaseInsensitiveFullPath(const std::string &fullPath) {
-		std::filesystem::path inspectedPath = System::GetWorkingDirectory();
-		const std::filesystem::path relativeFilePath = std::filesystem::path(fullPath).lexically_relative(inspectedPath);
-
-		// Iterate over all path parts
-		for (std::filesystem::path::const_iterator relativeFilePathIterator = relativeFilePath.begin(); relativeFilePathIterator != relativeFilePath.end(); ++relativeFilePathIterator) {
-			bool pathPartExists = false;
-
-			// Iterate over all entries in the path part's directory,
-			// to check if the path part is in there case insensitively
-			for (const std::filesystem::path &filesystemEntryPath : std::filesystem::directory_iterator(inspectedPath)) {
-				if (StringsEqualCaseInsensitive(filesystemEntryPath.filename().generic_string(), relativeFilePathIterator->generic_string())) {
-					inspectedPath = filesystemEntryPath;
-
-					// If the path part is found, stop looking for it
-					pathPartExists = true;
-					break;
-				}
-			}
-
-			if (!pathPartExists) {
-				// If part of the path exists, append the rest of fullPath its parts
-				while (relativeFilePathIterator != relativeFilePath.end()) {
-					inspectedPath /= relativeFilePathIterator->generic_string();
-					relativeFilePathIterator++;
-				}
-				break;
-			}
-		}
-
-		return inspectedPath.generic_string();
-	}
-
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	const std::vector<std::string> * LuaMan::DirectoryList(const std::string &path) {

Source/Managers/LuaMan.h

@@ -8,8 +8,6 @@
 
 #include "BS_thread_pool.hpp"
 
-#include <optional>
-
 #define g_LuaMan LuaMan::Instance()
 
 struct lua_State;
@@ -438,15 +436,6 @@ namespace RTE {
 #pragma endregion
 
 #pragma region File I/O Handling
-		/// <summary>
-		/// If a file "foo/Bar.txt" exists, and this method is passed "FOO/BAR.TXT", then this method will return "foo/Bar.txt".
-		/// This method's purpose is to enable Linux to get the real path using a case-insensitive search.
-		/// The real path is used by the Lua file I/O handling methods to ensure full Windows compatibility.
-		/// </summary>
-		/// <param name="fullPath">Path to case-insensitively translate to a real path.</param>
-		/// <returns>The real path. If the path doesn't exist, it returns the fullPath argument with all the existing parent directories correctly capitalized.</returns>
-		std::string GetCaseInsensitiveFullPath(const std::string &fullPath);
-
 		/// <summary>
 		/// Returns a vector of all the directories in path, which is relative to the working directory.
 		/// </summary>

Source/System/RTETools.cpp

@@ -218,4 +218,39 @@ namespace RTE {
 
 		return hash;
 	}
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	std::string GetCaseInsensitiveFullPath(const std::string &fullPath) {
+		std::filesystem::path inspectedPath = System::GetWorkingDirectory();
+		const std::filesystem::path relativeFilePath = std::filesystem::path(fullPath).lexically_relative(inspectedPath);
+
+		// Iterate over all path parts
+		for (std::filesystem::path::const_iterator relativeFilePathIterator = relativeFilePath.begin(); relativeFilePathIterator != relativeFilePath.end(); ++relativeFilePathIterator) {
+			bool pathPartExists = false;
+
+			// Iterate over all entries in the path part's directory,
+			// to check if the path part is in there case insensitively
+			for (const std::filesystem::path &filesystemEntryPath : std::filesystem::directory_iterator(inspectedPath)) {
+				if (StringsEqualCaseInsensitive(filesystemEntryPath.filename().generic_string(), relativeFilePathIterator->generic_string())) {
+					inspectedPath = filesystemEntryPath;
+
+					// If the path part is found, stop looking for it
+					pathPartExists = true;
+					break;
+				}
+			}
+
+			if (!pathPartExists) {
+				// If part of the path exists, append the rest of fullPath its parts
+				while (relativeFilePathIterator != relativeFilePath.end()) {
+					inspectedPath /= relativeFilePathIterator->generic_string();
+					relativeFilePathIterator++;
+				}
+				break;
+			}
+		}
+
+		return inspectedPath.generic_string();
+	}
 }

Source/System/RTETools.h

@@ -292,6 +292,15 @@ namespace RTE {
 		/// <returns>Whether the two strings are equal case insensitively.</returns>
 		inline bool StringsEqualCaseInsensitive(const std::string_view &strA, const std::string_view &strB) { return std::equal(strA.begin(), strA.end(), strB.begin(), strB.end(), [](char strAChar, char strBChar) { return std::tolower(strAChar) == std::tolower(strBChar); }); }
 
+		/// <summary>
+		/// If a file "foo/Bar.txt" exists, and this method is passed "FOO/BAR.TXT", then this method will return "foo/Bar.txt".
+		/// This method's purpose is to enable Linux to get the real path using a case-insensitive search.
+		/// The real path is used by the Lua file I/O handling methods to ensure full Windows compatibility.
+		/// </summary>
+		/// <param name="fullPath">Path to case-insensitively translate to a real path.</param>
+		/// <returns>The real path. If the path doesn't exist, it returns the fullPath argument with all the existing parent directories correctly capitalized.</returns>
+		std::string GetCaseInsensitiveFullPath(const std::string &fullPath);
+
 		/// <summary>
 		/// Hashes a string in a cross-compiler/platform safe way (std::hash gives different results on different compilers).
 		/// </summary>