OS agnostic path separator #3064
Conversation
| this->setBasePath(this->getGraphName() + "/"); | ||
| else if (providedBasePath.back() == '/') | ||
| this->setBasePath(this->getGraphName() + std::string(1, std::filesystem::path::preferred_separator)); | ||
| else if (providedBasePath.back() == std::string(1, std::filesystem::path::preferred_separator).back()) |
There was a problem hiding this comment.
Is this back() needed?
| else if (providedBasePath.back() == std::string(1, std::filesystem::path::preferred_separator).back()) | |
| else if (providedBasePath.back() == std::string(1, std::filesystem::path::preferred_separator)) |
There was a problem hiding this comment.
Yes, we need char to compare.
| @@ -563,7 +563,7 @@ TEST_F(TestLoadModel, CheckSavedModelHandling) { | |||
| auto model_files = modelInstance.getModelFiles(); | |||
| ASSERT_FALSE(model_files.empty()); | |||
| #ifdef _WIN32 | |||
| EXPECT_EQ(model_files.front(), directoryPath + "/test_saved_model/1\\"); | |||
| EXPECT_EQ(model_files.front(), directoryPath + "/test_saved_model\\1\\"); | |||
There was a problem hiding this comment.
Add function so we could use sth like this without macro's?
| EXPECT_EQ(model_files.front(), directoryPath + "/test_saved_model\\1\\"); | |
| EXPECT_EQ(model_files.front(), os_agnostic_path(directoryPath + "/test_saved_model/1/")); |
There was a problem hiding this comment.
Are those the only places where we encounter with the different separator handling of Win/Lin?
There was a problem hiding this comment.
This is a case by case result for different tests. Part of path is from config or hardcoded and the rest is generated by ovms. So the number of ifdef would be the same.
src/filesystem.hpp
Outdated
| } else { | ||
| rootDirectoryPath = currentWorkingDir + "/"; | ||
| rootDirectoryPath = currentWorkingDir + std::string(1, std::filesystem::path::preferred_separator); |
There was a problem hiding this comment.
can we make macro out of std::string(1, std::filesystem::path::preferred_separator)? or even declare it as constexpr so it is created only once
src/filesystem.cpp
Outdated
| @@ -116,4 +116,9 @@ std::string FileSystem::findFilePathWithExtension(const std::string& path, const | |||
| return std::string(); | |||
| } | |||
|
|
|||
| std::string& FileSystem::getOsSeparator() { | |||
🛠 Summary
JIRA CVS-160424
Switch to os agnostic path separator.
🧪 Checklist
``