UPD | fs path: fix something

Author: xiadnoring

include/ManapiString.hpp

@@ -104,4 +104,12 @@ namespace manapi::string {
      * @return
      */
     std::string fill (size_t s, char c);
+
+    /**
+     * Counts number of |c| in |str|
+     * @param c char
+     * @param str source string
+     * @return
+     */
+    std::size_t count (char c, std::string_view str) MANAPIHTTP_NOEXCEPT;
 }

include/fs/ManapiFilesystem.hpp

@@ -144,15 +144,20 @@ namespace manapi::filesystem::path {
 
     std::string absolute (std::string_view path);
 
+    std::string root_directory ();
+
     std::string_view back (std::string_view str);
 
+    void append (std::string &path, std::string_view next, bool root);
+
     void append (std::string &path, std::string_view next);
 
     std::string current_path ();
 
     template <class... Args>
     std::string join(std::string path, Args&&...args) {
-        (..., path::append(path, std::forward<Args>(args) ));
+        std::size_t i = 0;
+        (..., path::append(path, std::forward<Args>(args), !(i++) ));
         return std::move(path);
     }
 }

src/ManapiString.cpp

@@ -146,3 +146,14 @@ std::string manapi::string::fill(size_t s, char c) {
     memset(b.data(), c, s);
     return std::move(b);
 }
+
+std::size_t manapi::string::count(char c, std::string_view str) MANAPIHTTP_NOEXCEPT {
+    std::size_t res = 0;
+    auto it = str.find(c);
+    while (it != std::string_view::npos) {
+        res++;
+        str = str.substr(it + 1);
+        it = str.find(c);
+    }
+    return res;
+}

src/fs/ManapiFilesystem.cpp

@@ -784,7 +784,7 @@ std::string_view manapi::filesystem::path::back (std::string_view str) {
     return str;
 }
 
-static void append_ (std::string &path, std::string_view next, int delimiter) {
+static void append_ (std::string &path, std::string_view next, bool delimiter, bool root) {
     using namespace manapi::filesystem;
 
     if (delimiter) {
@@ -793,7 +793,7 @@ static void append_ (std::string &path, std::string_view next, int delimiter) {
             if (it == std::string_view::npos)
                 break;
             if (it) {
-                append_(path, next.substr(0, it), false);
+                append_(path, next.substr(0, it), false, root && path.empty());
             }
             else if (path.empty() || path.back() != path::delimiter) {
                 path.push_back(path::delimiter);
@@ -806,14 +806,18 @@ static void append_ (std::string &path, std::string_view next, int delimiter) {
         return;
 
     if (next == ".") {
-        if (path.empty()) {
+        if (path.empty() && root) {
             path = path::current_path();
         }
 
         return;
     }
 
     if (next == "..") {
+        if (path.empty() && root) {
+            path = path::current_path();
+        }
+
         auto it = path.rfind(path::delimiter);
         if (it == std::string_view::npos) {
             path.clear();
@@ -832,7 +836,12 @@ static void append_ (std::string &path, std::string_view next, int delimiter) {
     }
 }
 
+
 void manapi::filesystem::path::append(std::string &path, std::string_view next) {
+    path::append(path, next, false);
+}
+
+void manapi::filesystem::path::append(std::string &path, std::string_view next, bool root) {
     auto const c_size = path.size();
 #ifdef _MSC_VER 
     char *c = static_cast<char*>(alloca(c_size));
@@ -841,8 +850,8 @@ void manapi::filesystem::path::append(std::string &path, std::string_view next)
 #endif
     memcpy (c, path.data(), c_size);
     path.resize(0);
-    append_(path, std::string_view(c, c_size), true);
-    append_(path, next, true);
+    append_(path, std::string_view(c, c_size), true, root);
+    append_(path, next, true, false);
 }
 
 std::string manapi::filesystem::path::current_path() {
@@ -851,14 +860,18 @@ std::string manapi::filesystem::path::current_path() {
 
 std::string manapi::filesystem::path::serialize (std::string_view str) {
     std::string path;
-    append_ (path, str, true);
+    append_ (path, str, true, true);
     return std::move(path);
 }
 
 std::string manapi::filesystem::path::absolute(std::string_view path) {
     return std::filesystem::absolute(path).string();
 }
 
+std::string manapi::filesystem::path::root_directory() {
+    return std::filesystem::current_path().root_directory().string();
+}
+
 manapi::future<manapi::sys_error::status> manapi::filesystem::async_unlink (std::string path, async::cancellation_action cancellation) {
     co_return co_await async_fs_simple_operation ([path = std::move(path)] (std::shared_ptr<ev::fs> w)
         -> bool { return !w->unlink(path.data()); }, std::move(cancellation));

tests/test_fs.cpp

@@ -49,6 +49,36 @@ UTEST(fs_path, join_4) {
     ASSERT_TRUE (path == (s));
 }
 
+UTEST(fs_path, join_5) {
+    std::string path1 = manapi::filesystem::path::join(".", "..", "hello");
+    std::string path2 = manapi::filesystem::path::join("..", "hello");
+    ASSERT_TRUE (path1 == path2);
+}
+
+UTEST(fs_path, join_6) {
+    std::string b = manapi::filesystem::path::root_directory();
+    std::string path = manapi::filesystem::path::join (b, "hello", "test", "no");
+    std::string s = b;
+    s += std::string_view{"hello"};
+    s.append(manapi::filesystem::path::string_delimiter);
+    s.append("test");
+    s.append(manapi::filesystem::path::string_delimiter);
+    s.append("no");
+    ASSERT_TRUE (path == (s));
+}
+
+UTEST(fs_path, join_7) {
+    std::string b = manapi::filesystem::path::root_directory();
+    std::string path = manapi::filesystem::path::join ("A", "B", "C", "..", "..", "..", "..", "..", "..", ".", "A");
+    ASSERT_TRUE (path == "A");
+}
+
+UTEST(fs_path, join_8) {
+    std::string b = manapi::filesystem::path::root_directory();
+    std::string path = manapi::filesystem::path::join ("A", "B", "C", "D");
+    ASSERT_TRUE (manapi::string::count(manapi::filesystem::path::delimiter, path) == 3);
+}
+
 UTEST(fs_path, serialize_1) {
 #ifdef _WIN32
     std::string path = manapi::filesystem::path::serialize("\\\\\\\\\\dev\\\\.\\.\\.\\shm\\\\shm\\..\\..\\..\\dev\\\\shm\\\\.\\.\\\\dev\\shm\\..\\..");