expanduser,homedir,absolute: optional java

Author: scivision

+stdlib/absolute.m

@@ -1,4 +1,4 @@
-function c = absolute(p, base, expand_tilde)
+function c = absolute(p, base, expand_tilde, use_java)
 %% absolute(p)
 % path need not exist
 % absolute path will be relative to pwd if not exist
@@ -15,10 +15,11 @@
   p (1,1) string
   base string {mustBeScalarOrEmpty} = string.empty
   expand_tilde (1,1) logical = true
+  use_java (1,1) logical = false
 end
 
 if expand_tilde
-  c = stdlib.expanduser(p);
+  c = stdlib.expanduser(p, use_java);
 else
   c = p;
 end
@@ -31,7 +32,7 @@
   if isempty(base) || strlength(base) == 0
     c = stdlib.join(pwd, c);
   else
-    c = stdlib.join(stdlib.absolute(base), c);
+    c = stdlib.join(stdlib.absolute(base, string.empty, expand_tilde, use_java), c);
   end
 end
 

+stdlib/canonical.m

@@ -22,7 +22,7 @@
 end
 
 if expand_tilde
-  c = stdlib.expanduser(p);
+  c = stdlib.expanduser(p, use_java);
 else
   c = p;
 end

+stdlib/expanduser.m

@@ -1,4 +1,4 @@
-function e = expanduser(p)
+function e = expanduser(p, use_java)
 %% expanduser(path)
 % expands tilde ~ into user home directory
 %
@@ -10,6 +10,7 @@
 % * expanded: expanded path
 arguments
   p (1,1) string
+  use_java (1,1) logical = false
 end
 
 e = p;
@@ -18,7 +19,7 @@
   return
 end
 
-home = stdlib.homedir();
+home = stdlib.homedir(use_java);
 
 if ~isempty(home)
   e = stdlib.join(home, extractAfter(e, 1));

+stdlib/homedir.m

@@ -1,15 +1,18 @@
-function home = homedir()
+function home = homedir(use_java)
 % https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/lang/System.html#getProperty(java.lang.String)
 % https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/lang/System.html#getProperties()
-persistent h;
-
-if ~isempty(h)
-  home = h;
-  return
+arguments
+  use_java (1,1) logical = false
 end
 
-home = stdlib.posix(java.lang.System.getProperty("user.home"));
+if(use_java)
+  home = java.lang.System.getProperty("user.home");
+elseif ispc
+  home = getenv("USERPROFILE");
+else
+  home = getenv("HOME");
+end
 
-h = home;
+home = stdlib.posix(home);
 
 end

+stdlib/is_readable.m

@@ -1,16 +1,16 @@
-function ok = is_readable(file, use_jvm)
+function ok = is_readable(file, use_java)
 %% is_readable is file readable
 % https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/nio/file/Files.html#isReadable(java.nio.file.Path)
 
 arguments
   file (1,1) string
-  use_jvm (1,1) logical = false
+  use_java (1,1) logical = false
 end
 
-if use_jvm
+if use_java
   % java is about 10x slower than fileattrib
   % needs absolute()
-  file = stdlib.absolute(file);
+  file = stdlib.absolute(file, string.empty, false, use_java);
 
   ok = java.nio.file.Files.isReadable(java.io.File(file).toPath());
 else

+stdlib/is_regular_file.m

@@ -6,8 +6,8 @@
 opt = java.nio.file.LinkOption.values;
 
 % needs absolute()
-p = stdlib.absolute(p);
+p = stdlib.absolute(p, string.empty, false, true);
 
 isreg = java.nio.file.Files.isRegularFile(java.io.File(p).toPath(), opt);
 
-end
+end

+stdlib/is_symlink.m

@@ -9,7 +9,7 @@
 if isMATLABReleaseOlderThan("R2024b")
   % must be absolute path
   % NOT .canonical or symlink is gobbled!
-  p = stdlib.absolute(p);
+  p = stdlib.absolute(p, string.empty, false, true);
   ok = java.nio.file.Files.isSymbolicLink(java.io.File(p).toPath());
 else
   ok = isSymbolicLink(p);

+stdlib/is_writable.m

@@ -1,17 +1,17 @@
-function ok = is_writable(file, use_jvm)
+function ok = is_writable(file, use_java)
 %% is_writable
 % is path writable
 % https://docs.oracle.com/en/java/javase/22/docs/api/java.base/java/nio/file/Files.html#isWritable(java.nio.file.Path)
 
 arguments
   file (1,1) string
-  use_jvm (1,1) logical = false
+  use_java (1,1) logical = false
 end
 
-if use_jvm
+if use_java
   % java is about 10x slower than fileattrib
   % needs absolute()
-  file = stdlib.absolute(file);
+  file = stdlib.absolute(file, string.empty, false, use_java);
 
   ok = java.nio.file.Files.isWritable(java.io.File(file).toPath());
 else

+stdlib/read_symlink.m

@@ -14,7 +14,7 @@
 
 % must be absolute path
 % must not be .canonical or symlink is gobbled!
-r = stdlib.absolute(p);
+r = stdlib.absolute(p, string.empty, false, true);
 
 % https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/nio/file/Files.html#readSymbolicLink(java.nio.file.Path)
 r = stdlib.posix(...

+stdlib/resolve.m

@@ -14,6 +14,6 @@
   use_java (1,1) logical = false
 end
 
-r = stdlib.canonical(stdlib.absolute(p, "", expand_tilde), false, use_java);
+r = stdlib.canonical(stdlib.absolute(p, string.empty, expand_tilde, use_java), false, use_java);
 
 end