Skip to content

Static-ize sanitization regexes #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SimplisticMind wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Static-ize sanitization regexes #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/Util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,30 @@ namespace util

std::string SanitizeTexture(const std::string& a_path)
{
static const srell::regex slashExpr("/+|\\\\+");
static const srell::regex leadingSlashExpr("^\\\\+");
static const srell::regex texturesExpr(R"(.*?[^\s]textures\\|^textures\\)", srell::regex::icase);

auto path = string::tolower(a_path);

path = srell::regex_replace(path, srell::regex("/+|\\\\+"), "\\");
path = srell::regex_replace(path, srell::regex("^\\\\+"), "");
path = srell::regex_replace(path, srell::regex(R"(.*?[^\s]textures\\|^textures\\)", srell::regex::icase), "");
path = srell::regex_replace(path, slashExpr, "\\");
path = srell::regex_replace(path, leadingSlashExpr, "");
path = srell::regex_replace(path, texturesExpr, "");

return path;
}

std::string SanitizeModel(const std::string& a_path)
{
static const srell::regex slashExpr("/+|\\\\+");
static const srell::regex leadingSlashExpr("^\\\\+");
static const srell::regex meshesExpr(R"(.*?[^\s]meshes\\|^meshes\\)", srell::regex::icase);

auto path = string::tolower(a_path);

path = srell::regex_replace(path, srell::regex("/+|\\\\+"), "\\");
path = srell::regex_replace(path, srell::regex("^\\\\+"), "");
path = srell::regex_replace(path, srell::regex(R"(.*?[^\s]meshes\\|^meshes\\)", srell::regex::icase), "");
path = srell::regex_replace(path, slashExpr, "\\");
path = srell::regex_replace(path, leadingSlashExpr, "");
path = srell::regex_replace(path, meshesExpr, "");

return path;
}
Expand Down