homedir,absolute_path: require Java

Author: scivision

+stdlib/+fileio/absolute_path.m

@@ -25,15 +25,6 @@
 % REQUIRES path to exist, while java method does not.
 % abspath = builtin('_canonicalizepath', abspath);
 
-try
-  abspath = string(java.io.File(abspath).getCanonicalPath());
-catch excp
-  if excp.identifier == "MATLAB:undefinedVarOrClass"
-    % Java is not available, so return unmodified path
-    return
-  else
-    error("stdlib:fileio:absolute_path", "%s is not a canonicalizable path.  %s", abspath, excp.message)
-  end
-end
+abspath = string(java.io.File(abspath).getCanonicalPath());
 
 end % function

+stdlib/+fileio/extract_zstd.m

@@ -2,14 +2,12 @@ function extract_zstd(archive, out_dir)
 
 arguments
   archive (1,1) string {mustBeFile}
-  out_dir (1,1) string
+  out_dir (1,1) string {mustBeFolder}
 end
 
 archive = stdlib.fileio.absolute_path(archive);
 out_dir = stdlib.fileio.absolute_path(out_dir);
 
-assert(isfolder(out_dir), "%s is not a folder", out_dir)
-
 exe = stdlib.fileio.which("cmake");
 if isempty(exe)
   extract_zstd_bin(archive, outdir)

+stdlib/+fileio/homedir.m

@@ -7,21 +7,8 @@
   return
 end
 
-try
-   home = string(java.lang.System.getProperty("user.home"));
-catch excp
-    % if Java not available use env vars, else error
-    if excp.identifier ~= "MATLAB:undefinedVarOrClass"
-      error("stdlib:fileio:homedir", excp.message)
-    end
-
-    if ispc
-      home = getenv('USERPROFILE');
-    else
-      home = getenv('HOME');
-    end
-end
+home = string(java.lang.System.getProperty("user.home"));
 
 h = home;
 
-end
+end

+stdlib/+fileio/is_absolute_path.m

@@ -1,21 +1,15 @@
 function isabs = is_absolute_path(apath)
 
 arguments
-  apath string
+  apath string {mustBeScalarOrEmpty}
 end
 
-% leave expanduser() here to work like C++ filesystem::path::is_absolute()
-apath = stdlib.fileio.expanduser(apath);
-
-if ispc
-  i = strlength(apath) < 3;
-  isabs(i) = false;
-
-  hasDrive = cell2mat(isstrprop(extractBefore(apath(~i), 2), "alpha", "ForceCellOutput", true));
-  isabs(~i) = hasDrive & extractBetween(apath(~i), 2,2) == ":" & ...
-                   (extractBetween(apath(~i), 3,3) == "/" | extractBetween(apath(~i), 3,3) == "\");
-else
-  isabs = startsWith(apath, "/");
+if isempty(apath)
+  isabs = logical.empty();
+  return
 end
 
+% expanduser() here to work like C++ filesystem::path::is_absolute()
+isabs = java.io.File(stdlib.fileio.expanduser(apath)).isAbsolute();
+
 end

+stdlib/+fileio/makedir.m

@@ -13,6 +13,6 @@ function makedir(direc)
 
 mkdir(direc);
 
-assert(isfolder(direc), "stdlib:fileio:makedir:IOError", 'not a directory %s', direc)
+mustBeFolder(direc)
 
 end

+stdlib/+sys/subprocess_run.m

@@ -15,8 +15,8 @@
 end
 
 if ~isempty(opt.cwd)
+  mustBeFolder(opt.cwd)
   cwd = stdlib.fileio.absolute_path(opt.cwd);
-  assert(isfolder(cwd), "subprocess_run: %s is not a folder", cwd)
   oldcwd = pwd;
   cd(cwd)
 end

+stdlib/is_absolute_path.m

@@ -6,7 +6,7 @@
 %  os.path.isabs("/foo/../bar") == True
 
 arguments
-  apath string
+  apath string {mustBeScalarOrEmpty}
 end
 
 isabs = stdlib.fileio.is_absolute_path(apath);