mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-09 03:39:14 +00:00
Code Issues Projects Releases Wiki Activity

Updates to resource path handling

Browse Source 
- Remove consecutive slashes
- Only use backslashes
- Try to find the top level directory in the path before prepending it
This commit is contained in:
Alexei Kotov 2023-09-28 18:29:22 +03:00
parent 284129b9ec
commit 1da9038b35
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
components/misc/resourcehelpers.cpp
View File

@ -56,13 +56,26 @@ std::string Misc::ResourceHelpers::correctResourcePath(
std::string correctedPath = Misc::StringUtils::lowerCase(resPath);
// Apparently, leading separators are allowed
while (correctedPath.size() && (correctedPath[0] == '/' || correctedPath[0] == '\\'))
// Flatten slashes
std::replace(correctedPath.begin(), correctedPath.end(), '/', '\\');
auto bothSeparators = [](char a, char b) { return a == '\\' && b == '\\'; };
correctedPath.erase(std::unique(correctedPath.begin(), correctedPath.end(), bothSeparators), correctedPath.end());
// Remove leading separator
if (!correctedPath.empty() && correctedPath[0] == '\\')
correctedPath.erase(0, 1);
// Handle top level directory
if (!correctedPath.starts_with(topLevelDirectory) || correctedPath.size() <= topLevelDirectory.size()
|| (correctedPath[topLevelDirectory.size()] != '/' && correctedPath[topLevelDirectory.size()] != '\\'))
correctedPath = std::string{ topLevelDirectory } + '\\' + correctedPath;
|| correctedPath[topLevelDirectory.size()] != '\\')
{
std::string topLevelPrefix = std::string{ topLevelDirectory } + '\\';
size_t topLevelPos = correctedPath.find('\\' + topLevelPrefix);
if (topLevelPos == std::string::npos)
correctedPath = topLevelPrefix + correctedPath;
else
correctedPath.erase(0, topLevelPos + 1);
}
std::string origExt = correctedPath;