normalize: avail in Mex, Java, Python, and native Matlab

Author: scivision

+stdlib/+java/normalize.m

@@ -0,0 +1,16 @@
+function n = normalize(p)
+
+n = string(javaPathObject(p).normalize());
+
+if stdlib.strempty(n)
+  n = "."; 
+else 
+  n = strip(n, 'right', '/');
+  if ispc()
+    n = strip(n, 'right', filesep);
+  end
+end
+
+
+
+end

+stdlib/+native/normalize.m

@@ -0,0 +1,54 @@
+function n = normalize(p)
+
+n = stdlib.posix(string(p));
+
+uncslash = ispc() && startsWith(n, "//");
+
+% use split to remove /../ and /./ and duplicated /
+parts = split(n, '/');
+i0 = 1;
+if strncmp(n, "/", 1)
+  n = "/";
+elseif ispc() && strlength(n) >= 2 && ~stdlib.strempty(stdlib.root_name(p))
+  n = parts(1);
+  i0 = 2;
+else
+  n = "";
+end
+
+for i = i0:length(parts)
+  if parts(i) == ".."
+    if n == ""
+      n = parts(i);
+    elseif endsWith(n, "..")
+      n = n + "/" + parts(i);
+    else
+      j = strfind(n, "/");
+      if isempty(j)
+        n = "";
+      else
+        n = n{1}(1:j(end)-1);
+      end
+    end
+  elseif all(parts(i) ~= [".", ""])
+    if n == ""
+      n = parts(i);
+    elseif n == "/"
+      n = n + parts(i);
+    else
+      n = n + "/" + parts(i);
+    end
+  end
+end
+
+if uncslash
+  n = strcat("/", n);
+end
+
+n = fullfile(n);
+
+if stdlib.strempty(n)
+  n = ".";
+end
+
+end

+stdlib/+python/normalize.m

@@ -0,0 +1,12 @@
+function n = normalize(p)
+
+try
+  n = string(py.os.path.normpath(p));
+  n = strip(n, 'right', '/');
+  if ispc()
+    n = strip(n, 'right', filesep);
+  end
+catch e
+  warning(e.identifier, "%s", e.message)
+  n = "";
+end

+stdlib/normalize.m

@@ -13,57 +13,15 @@
 
 function n = normalize(p)
 arguments
-  p (1,1) string
+  p {mustBeTextScalar}
 end
 
-n = stdlib.posix(p);
-
-uncslash = ispc() && startsWith(n, "//");
-
-% use split to remove /../ and /./ and duplicated /
-parts = split(n, '/');
-i0 = 1;
-if strncmp(n, "/", 1)
-  n = "/";
-elseif ispc() && strlength(n) >= 2 && ~stdlib.strempty(stdlib.root_name(p))
-  n = parts(1);
-  i0 = 2;
+if stdlib.has_java()
+  n = stdlib.java.normalize(p);
+elseif stdlib.has_python()
+  n = stdlib.python.normalize(p);
 else
-  n = "";
-end
-
-for i = i0:length(parts)
-  if parts(i) == ".."
-    if n == ""
-      n = parts(i);
-    elseif endsWith(n, "..")
-      n = n + "/" + parts(i);
-    else
-      j = strfind(n, "/");
-      if isempty(j)
-        n = "";
-      else
-        n = n{1}(1:j(end)-1);
-      end
-    end
-  elseif all(parts(i) ~= [".", ""])
-    if n == ""
-      n = parts(i);
-    elseif n == "/"
-      n = n + parts(i);
-    else
-      n = n + "/" + parts(i);
-    end
-  end
-end
-
-if uncslash
-  n = strcat("/", n);
-end
-
-
-if stdlib.strempty(n)
-  n = ".";
+  n = stdlib.native.normalize(p);
 end
 
 end

src/normalize_fs.cpp

@@ -30,10 +30,10 @@ std::string fs_normalize(std::string_view path)
 {
   std::filesystem::path p(path);
 
-  std::string r = p.lexically_normal().generic_string();
+  std::string r = p.lexically_normal().string();
 
   // no trailing slash
-  if (r.length() > 1 && r.back() == '/' && (!fs_is_windows() || p != p.root_path()))
+  if (r.length() > 1 && (r.back() == '/' || (fs_is_windows() && r.back() == '\\')) && (!fs_is_windows() || p != p.root_path()))
     r.pop_back();
 
   if (r.empty())

test/TestCanonical.m

@@ -7,8 +7,7 @@
 {"a/../b", "b"}, ...
 {strcat(mfilename("fullpath"), '.m/..'), string(fileparts(mfilename("fullpath")))}, ...
 {"not-exist/a/..", "not-exist"}, ...
-{"./not-exist", "not-exist"}, ...
-{"../not-exist", "../not-exist"}
+{"./not-exist", "not-exist"}
 };
 end
 

test/TestNormalize.m

@@ -3,6 +3,7 @@
 properties (TestParameter)
 p = init_norm()
 d = init_drop_slash()
+norm_fun = {@stdlib.normalize, @stdlib.native.normalize, @stdlib.java.normalize, @stdlib.python.normalize}
 end
 
 methods(TestClassSetup)
@@ -13,8 +14,11 @@ function pkg_path(tc)
 end
 
 methods (Test, TestTags="pure")
-function test_normalize(tc, p)
-tc.verifyEqual(stdlib.normalize(p{1}), p{2}, ...
+
+function test_normalize(tc, p, norm_fun)
+is_capable(tc, norm_fun)
+
+tc.verifyEqual(norm_fun(p{1}), p{2}, ...
   sprintf("normalize(%s)   mex: %d", p{1}, stdlib.is_mex_fun("stdlib.normalize")))
 end
 
@@ -32,26 +36,26 @@ function test_drop_slash(tc, d)
 p = {
   {"", "."}, ...
   {"a/..", "."}, ...
-  {"//a/b/", "/a/b"}, ...
-  {"/a/b/", "/a/b"},  ...
-  {"a/b/", "a/b"}, ...
+  {"/a/b/", fullfile("/a", "b")},  ...
+  {"a/b/", fullfile("a", "b")}, ...
   {"a/../c", "c"}, ...
-  {"a/b/../c", "a/c"}, ...
+  {"a/b/../c", fullfile("a", "c")}, ...
   {"a/b/../../c", "c"}, ...
   {"a/b/../../c/..", "."}, ...
   {"a/b/../../c/../..", ".."}, ...
-  {"a////b", "a/b"}, ...
+  {"a////b", fullfile("a", "b")}, ...
   {".a", ".a"}, ...
   {"..a", "..a"}, ...
   {"a.", "a."}, ...
   {"a..", "a.."}, ...
   {"./a/.", "a"}, ...
-  {"../a", "../a"}
+  {"../a", fullfile("..", "a")}
 };
 
 if ispc
-  p{3}{2} = "//a/b";
+  p{end+1} = {"//a/b/", "\\a\b"};
 end
+
 end