Make returned path generic in PresetMan::FullModulePath to not have to correct backslashes after getting it (twice in some cases)

Author: MaximDude

Managers/PresetMan.cpp

@@ -351,15 +351,19 @@ bool PresetMan::IsModuleUserdata(std::string moduleName) const {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-std::string PresetMan::FullModulePath(std::string modulePath)
-{
-    const std::string moduleName = GetModuleNameFromPath(modulePath);
-    const std::string moduleFolder = (IsModuleOfficial(moduleName) ? "Data/" : IsModuleUserdata(moduleName) ? System::GetUserdataDirectory() : System::GetModDirectory());
-    const std::string topFolder = modulePath.substr(0, modulePath.find_first_of("/\\") + 1);
-    if (topFolder == moduleFolder) {
-        return modulePath;
-    }
-    return moduleFolder + modulePath;
+std::string PresetMan::FullModulePath(const std::string &modulePath) {
+	const std::string modulePathGeneric = std::filesystem::path(modulePath).generic_string();
+	const std::string pathTopDir = modulePathGeneric.substr(0, modulePathGeneric.find_first_of("/\\") + 1);
+	const std::string moduleName = GetModuleNameFromPath(modulePathGeneric);
+
+	std::string moduleTopDir = System::GetModDirectory();
+
+	if (IsModuleOfficial(moduleName)) {
+		moduleTopDir = System::GetDataDirectory();
+	} else if (IsModuleUserdata(moduleName)) {
+		moduleTopDir = System::GetUserdataDirectory();
+	}
+	return (pathTopDir == moduleTopDir) ? modulePathGeneric : moduleTopDir + modulePathGeneric;
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////

Managers/PresetMan.h

@@ -178,7 +178,6 @@ class PresetMan : public Singleton<PresetMan> {
 	/// <returns>True if the module is an official data module, otherwise false.</returns>
     bool IsModuleOfficial(std::string moduleName);
 
-
 	/// <summary>
 	/// Returns whether or not the module is vanilla.
 	/// </summary>
@@ -191,7 +190,7 @@ class PresetMan : public Singleton<PresetMan> {
     /// </summary>
     /// <param name="modulePath">The Path to be completed.</param>
     /// <returns>The complete path to the file, including Data/, Userdata/ or Mods/ based on whether or not it's part of an official module or userdata.</returns>
-    std::string FullModulePath(std::string modulePath);
+    std::string FullModulePath(const std::string &modulePath);
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Method:          GetTotalModuleCount

System/System.cpp

@@ -16,6 +16,7 @@ namespace RTE {
 	std::vector<size_t> System::s_WorkingTree;
 	std::filesystem::file_time_type System::s_ProgramStartTime = std::filesystem::file_time_type::clock::now();
 	bool System::s_CaseSensitive = true;
+	const std::string System::s_DataDirectory = "Data/";
 	const std::string System::s_ScreenshotDirectory = "ScreenShots/";
 	const std::string System::s_ModDirectory = "Mods/";
 	const std::string System::s_UserdataDirectory = "Userdata/";

System/System.h

@@ -43,6 +43,12 @@ namespace RTE {
 		/// <returns>Absolute path to current working directory.</returns>
 		static const std::string & GetWorkingDirectory() { return s_WorkingDirectory; }
 
+		/// <summary>
+		/// Gets the game data directory name.
+		/// </summary>
+		/// <returns>Folder name of the game data directory.</returns>
+		static const std::string & GetDataDirectory() { return s_DataDirectory; }
+
 		/// <summary>
 		/// Gets the screenshot directory name.
 		/// </summary>
@@ -174,6 +180,7 @@ namespace RTE {
 		static std::filesystem::file_time_type s_ProgramStartTime; //!< Low precision time point of program start for checking if a file was created after starting.
 
 		static bool s_CaseSensitive; //!< Whether case sensitivity is enforced when checking for file existence.
+		static const std::string s_DataDirectory; //!< String containing the folder name of the game data directory.
 		static const std::string s_ScreenshotDirectory; //!< String containing the folder name of the screenshots directory.
 		static const std::string s_ModDirectory; //!< String containing the folder name of the mod directory.
 		static const std::string s_UserdataDirectory; //!< String containing the folder name of the userdata directory.