Match common5 separator/basename/parentPath

* Separator with an emptry string argument should return the preferred separator for that platform * Basename should return basename in the case with multiple trailing slashes Signed-off-by: Michael Carroll <[email protected]>
gazebosim · Feb 17, 2022 · 3e101f8 · 3e101f8
1 parent 52e3c2a
commit 3e101f8
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 16 deletions.
diff --git a/src/Filesystem.cc b/src/Filesystem.cc
@@ -99,8 +99,7 @@ bool ignition::common::createDirectories(const std::string &_path)
 /////////////////////////////////////////////////
 std::string const ignition::common::separator(std::string const &_s)
 {
-  fs::path path(_s);
-  return (_s / fs::path("")).string();
+  return _s + std::string{fs::path::preferred_separator};
 }
 
 /////////////////////////////////////////////////
@@ -144,6 +143,11 @@ std::string ignition::common::joinPaths(
   fs::path p1{_path1};
   fs::path p2{_path2};
 
+  if (p1.empty())
+  {
+    p1 = ignition::common::separator("");
+  }
+
   bool is_url = false;
 
   if (_path1.find("://") == std::string::npos)
@@ -201,25 +205,24 @@ bool ignition::common::chdir(const std::string &_dir)
 /////////////////////////////////////////////////
 std::string ignition::common::basename(const std::string &_path)
 {
-  fs::path p(_path);
-  // Maintain compatibility with ign-common
-  if (*_path.rbegin() == fs::path::preferred_separator)
-    p = fs::path(_path.substr(0, _path.size()-1));
-  return p.filename().string();
+  fs::path p = fs::path(_path);
+  p /= "FOO.TXT";
+  p = p.lexically_normal();
+  p = p.parent_path();
+  return p.filename().string().empty() ? 
+    std::string{fs::path::preferred_separator} : p.filename().string();
 }
 
 /////////////////////////////////////////////////
 std::string ignition::common::parentPath(const std::string &_path)
 {
-  fs::path p(_path);
-  // Maintain compatibility with ign-common
-  if (*_path.rbegin() == fs::path::preferred_separator)
-    p = fs::path(_path.substr(0, _path.size()-1));
-
-  if (!p.has_parent_path())
-    return _path;
-
-  return p.parent_path().string();
+  std::string result;
+  size_t last_sep = _path.find_last_of(separator(""));
+  // If slash is the last character, find its parent directory
+  if (last_sep == _path.length() - 1)
+    last_sep = _path.substr(0, last_sep).find_last_of(separator(""));
+  result = _path.substr(0, last_sep);
+  return result;
 }
 
 /////////////////////////////////////////////////

diff --git a/src/Filesystem_TEST.cc b/src/Filesystem_TEST.cc
@@ -620,6 +620,16 @@ TEST_F(FilesystemTest, uniquePaths)
   EXPECT_TRUE(removeDirectory(dirExistingRt)) << dirExistingRt;
 }
 
+/////////////////////////////////////////////////
+TEST_F(FilesystemTest, separator)
+{
+#ifndef _WIN32
+  EXPECT_EQ("/", ignition::common::separator(""));
+#else
+  EXPECT_EQ("\\", ignition::common::separator("")); 
+#endif
+}
+
 /////////////////////////////////////////////////
 /// Main
 int main(int argc, char **argv)