{create,is,read}_symlink: speedup

scivision · scivision · commit 70a22d5b78a7 · 2025-09-05T09:36:25.000-04:00
diff --git a/+stdlib/+dotnet/private/dotnetException.m b/+stdlib/+dotnet/private/dotnetException.m
@@ -4,12 +4,18 @@ function dotnetException(e)
   case 'MException'
     switch e.identifier
       case {'MATLAB:NET:NetConversion:StringConversion'}
-      otherwise, rethrow(e)
+        % pass
+      case 'MATLAB:undefinedVarOrClass'
+        % .NET not enabled
+      otherwise
+        rethrow(e)
     end
   case 'NET.NetException'
     switch class(e.ExceptionObject)
       case {'System.IO.DriveNotFoundException', 'System.IO.FileNotFoundException', 'System.ArgumentException'}
-      otherwise, rethrow(e)
+        % pass
+      otherwise
+        rethrow(e)
     end
 end
 
diff --git a/+stdlib/+dotnet/read_symlink.m b/+stdlib/+dotnet/read_symlink.m
@@ -7,12 +7,9 @@
   h = System.IO.FileInfo(file);
   r = string(h.LinkTarget);
   % on Unix, this can be empty if the file is not a symlink
-  if isempty(r)
-    r = "";
-  end
 catch e
   dotnetException(e)
-  r = "";
+  r = string.empty;
 end
 
 end
diff --git a/+stdlib/+java/is_symlink.m b/+stdlib/+java/is_symlink.m
@@ -1,5 +1,9 @@
 function ok = is_symlink(file)
 
-ok = java.nio.file.Files.isSymbolicLink(javaAbsolutePath(file));
+try
+  ok = java.nio.file.Files.isSymbolicLink(javaAbsolutePath(file));
+catch e
+  javaException(e)
+end
 
 end
diff --git a/+stdlib/+java/read_symlink.m b/+stdlib/+java/read_symlink.m
@@ -10,7 +10,7 @@
   r = string(java.nio.file.Files.readSymbolicLink(javaAbsolutePath(file)));
 catch e
   javaException(e)
-  r = "";
+  r = string.empty;
 end
 
 end
diff --git a/+stdlib/+legacy/canonical.m b/+stdlib/+legacy/canonical.m
@@ -6,7 +6,9 @@
 
 c = "";
 
-if stdlib.strempty(file), return, end
+if stdlib.strempty(file)
+  return
+end
 
 [s, r] = fileattrib(file);
 
diff --git a/+stdlib/+native/create_symlink.m b/+stdlib/+native/create_symlink.m
@@ -0,0 +1,17 @@
+function i = create_symlink(target, link)
+
+try
+  createSymbolicLink(link, target);
+  i = true;
+catch e
+  switch e.identifier
+    case {'MATLAB:UndefinedFunction', 'MATLAB:io:filesystem:symlink:NeedsAdminPerms'}
+      i = logical.empty;
+    case {'MATLAB:io:filesystem:symlink:FileExists', 'MATLAB:io:filesystem:symlink:TargetNotFound'}
+      i = false;
+    otherwise
+      rethrow(e)
+  end
+end
+
+end
diff --git a/+stdlib/+native/is_symlink.m b/+stdlib/+native/is_symlink.m
@@ -0,0 +1,12 @@
+function i = is_symlink(file)
+
+try
+  i = isSymbolicLink(file);
+catch e
+  if e.identifier ~= "MATLAB:UndefinedFunction"
+    rethrow(e)
+  end
+  i = logical.empty;
+end
+
+end
diff --git a/+stdlib/+native/read_symlink.m b/+stdlib/+native/read_symlink.m
@@ -0,0 +1,15 @@
+function r = read_symlink(file)
+
+try
+  [ok, r] = isSymbolicLink(file);
+  if ~ok
+    r = string.empty;
+  end
+catch e
+  if e.identifier ~= "MATLAB:UndefinedFunction"
+    rethrow(e)
+  end
+  r = string.empty;
+end
+
+end
diff --git a/+stdlib/+python/create_symlink.m b/+stdlib/+python/create_symlink.m
@@ -14,7 +14,6 @@
   ok = true;
 catch e
   warning(e.identifier, "create_symlink(%s, %s) failed: %s", target, link, e.message);
-  ok = false;
 end
 
 end
diff --git a/+stdlib/+python/read_symlink.m b/+stdlib/+python/read_symlink.m
@@ -1,9 +1,11 @@
 function r = read_symlink(file)
 
-r = "";
+r = string.empty;
 
 p = py.pathlib.Path(file);
-if ~p.is_symlink(), return, end
+if ~p.is_symlink()
+  return
+end
 
 % https://docs.python.org/3/library/pathlib.html#pathlib.Path.readlink
 try
diff --git a/+stdlib/+sys/read_symlink.m b/+stdlib/+sys/read_symlink.m
@@ -3,7 +3,7 @@
   file (1,1) string
 end
 
-r = "";
+r = string.empty;
 
 if isunix()
   cmd = sprintf('readlink -fn "%s"', file);
@@ -14,7 +14,7 @@
   % worried if searching for "Tag value: Symbolic Link" might be locale dependent
 end
 
-if stdlib.is_symlink(file)
+if stdlib.sys.is_symlink(file)
   [s, m] = system(cmd);
   if s == 0
     m = strip(string(m));
diff --git a/+stdlib/Backend.m b/+stdlib/Backend.m
@@ -102,6 +102,18 @@
           pyv = stdlib.python_version();
           if any(pyv(1:2) < [3, 12]), continue, end
       end
+    case 'native'
+
+      switch functionName
+        case 'create_symlink'
+          % Some Windows R2025a give error 'MATLAB:io:filesystem:symlink:NeedsAdminPerms'
+          % 25.1.0.2973910 (R2025a) Update 1 gave this error for example.
+          if stdlib.matlabOlderThan('R2024b') || ispc()
+            continue
+          end
+        case {'is_symlink', 'read_symlink'}
+          if stdlib.matlabOlderThan('R2024b'), continue, end
+      end
   end
 
   if ~isempty(which(sprintf('%s.%s.%s', self.namespace, m, functionName)))
diff --git a/+stdlib/create_symlink.m b/+stdlib/create_symlink.m
@@ -4,43 +4,39 @@
 % * target: path to link to
 % * link: path to create link at
 %%% Outputs
-% * ok: true if successful
+% * i: true if successful
 % * b: backend used
 %
 % Some Windows Matlab R2025a give error 'MATLAB:io:filesystem:symlink:NeedsAdminPerms'
 % For example, Matlab 25.1.0.2973910 R2025a Update 1 gave this error.
 
-function [ok, b] = create_symlink(target, link, backend)
+function [i, b] = create_symlink(target, link, backend)
 arguments
   target
   link
   backend (1,:) string = ["native", "dotnet", "python", "sys"]
 end
 
+i = logical.empty;
 
-if ismember('native', backend) || stdlib.strempty(backend)
-  try
-    createSymbolicLink(link, target);
-    ok = true;
-    b = "native";
-    return
-  catch e
-    switch e.identifier
-      case {'MATLAB:UndefinedFunction', 'MATLAB:io:filesystem:symlink:NeedsAdminPerms'}
-        % pass through to stdlib.Backend
-      case {'MATLAB:io:filesystem:symlink:FileExists', 'MATLAB:io:filesystem:symlink:TargetNotFound'}
-        ok = false;
-        return
-      otherwise
-        rethrow(e)
-    end
+for b = backend
+  switch b
+    case "native"
+      i = stdlib.native.create_symlink(target, link);
+    case "dotnet"
+      i = stdlib.dotnet.create_symlink(target, link);
+    case "python"
+      if stdlib.matlabOlderThan('R2022a'), continue, end
+      i = stdlib.python.create_symlink(target, link);
+    case "sys"
+      i = stdlib.sys.create_symlink(target, link);
+    otherwise
+      error("stdlib:create_symlink:ValueError", "Unknown backend: %s", b)
   end
 
-  backend(ismember(backend, 'native')) = [];
+  if ~isempty(i)
+    return
+  end
 end
 
-o = stdlib.Backend(mfilename(), backend);
-b = o.backend;
-ok = o.func(target, link);
-
 end
diff --git a/+stdlib/is_symlink.m b/+stdlib/is_symlink.m
@@ -4,31 +4,37 @@
 % * file: path to check
 % * backend: backend to use
 %%% Outputs
-% * ok: true if path is a symbolic link
+% * i: true if path is a symbolic link
 % * b: backend used
 
-function [ok, b] = is_symlink(file, backend)
+function [i, b] = is_symlink(file, backend)
 arguments
-  file string
+  file (1,1) string
   backend (1,:) string = ["native", "java", "python", "dotnet", "sys"]
 end
 
-if ismember('native', backend) || stdlib.strempty(backend)
-  try
-    ok = isSymbolicLink(file);
-    b = "native";
-    return
-  catch e
-    if e.identifier ~= "MATLAB:UndefinedFunction"
-      rethrow(e)
-    end
+i = logical.empty;
+
+for b = backend
+  switch b
+    case "java"
+      i = stdlib.java.is_symlink(file);
+    case "native"
+      i = stdlib.native.is_symlink(file);
+    case "dotnet"
+      i = stdlib.dotnet.is_symlink(file);
+    case "python"
+      if stdlib.matlabOlderThan('R2022a'), continue, end
+      i = stdlib.python.is_symlink(file);
+    case "sys"
+      i = stdlib.sys.is_symlink(file);
+    otherwise
+      error("stdlib:is_symlink:ValueError", "Unknown backend: %s", b)
   end
 
-  backend(ismember(backend, 'native')) = [];
+  if ~isempty(i)
+    return
+  end
 end
 
-o = stdlib.Backend(mfilename(), backend);
-b = o.backend;
-ok = o.func(file);
-
 end
diff --git a/+stdlib/read_symlink.m b/+stdlib/read_symlink.m
@@ -17,23 +17,28 @@
 end
 
 
-if ismember('native', backend) || stdlib.strempty(backend)
-  try
-    [ok, r] = isSymbolicLink(file);
-    r(~ok) = "";
-    b = "native";
-    return
-  catch e
-    if e.identifier ~= "MATLAB:UndefinedFunction"
-      rethrow(e)
-    end
+r = string.empty;
+
+for b = backend
+  switch b
+    case "java"
+      r = stdlib.java.read_symlink(file);
+    case "native"
+      r = stdlib.native.read_symlink(file);
+    case "dotnet"
+      r = stdlib.dotnet.read_symlink(file);
+    case "python"
+      if stdlib.matlabOlderThan('R2022a'), continue, end
+      r = stdlib.python.read_symlink(file);
+    case "sys"
+      r = stdlib.sys.read_symlink(file);
+    otherwise
+      error("stdlib:read_symlink:ValueError", "Unknown backend: %s", b)
   end
 
-  backend(ismember(backend, 'native')) = [];
+  if ~isempty(r)
+    return
+  end
 end
 
-o = stdlib.Backend(mfilename(), backend);
-b = o.backend;
-r = o.func(file);
-
 end
diff --git a/test/TestSymlink.m b/test/TestSymlink.m
@@ -47,13 +47,17 @@ function setup_symlink(tc)
 methods (Test)
 
 function test_is_symlink(tc, p, B_is_symlink)
-tc.verifyTrue(stdlib.is_symlink(tc.link, B_is_symlink), "failed to detect own link")
+[i, b] = stdlib.is_symlink(tc.link, B_is_symlink);
+
+tc.verifyEqual(char(b), B_is_symlink)
+tc.verifyTrue(i, "failed to detect own link")
+
 tc.verifyEqual(stdlib.is_symlink(p{1}, B_is_symlink), p{2}, p{1})
 end
 
 
 function test_read_symlink_empty(tc, Pre, B_read_symlink)
-tc.verifyEqual(stdlib.read_symlink(Pre, B_read_symlink), "")
+tc.verifyEqual(stdlib.read_symlink(Pre, B_read_symlink), string.empty)
 end
 
 
