work >= R2020a. Remove copyfile. ncvariables(..., group) option

Author: scivision

+stdlib/+fileio/absolute_path.m

@@ -10,13 +10,10 @@
   p (1,:) string
 end
 
-import stdlib.fileio.expanduser
-import stdlib.fileio.is_absolute_path
-
 % have to expand ~ first
-p = expanduser(p);
+p = stdlib.fileio.expanduser(p);
 
-if ~is_absolute_path(p)
+if ~stdlib.fileio.is_absolute_path(p)
   % otherwise the default is Documents/Matlab, which is probably not wanted.
   p = fullfile(pwd, p);
 end

+stdlib/+fileio/copyfile.m

@@ -5,26 +5,21 @@ function extract_zstd(archive, out_dir)
 % For our user audience, CMake is at least as likely to be installed as Zstd.
 
 arguments
-  archive (1,1) string
+  archive (1,1) string {mustBeFile}
   out_dir (1,1) string
 end
 
-import stdlib.fileio.absolute_path
-import stdlib.fileio.which
-import stdlib.sys.subprocess_run
-
-archive = absolute_path(archive);
-out_dir = absolute_path(out_dir);
+archive = stdlib.fileio.absolute_path(archive);
+out_dir = stdlib.fileio.absolute_path(out_dir);
 
-assert(isfile(archive), "%s is not a file", archive)
 assert(isfolder(out_dir), "%s is not a folder", out_dir)
 
-exe = which("cmake");
+exe = stdlib.fileio.which("cmake");
 if isempty(exe)
   extract_zstd_bin(archive, outdir)
 end
 
-[ret, msg] = subprocess_run([exe, "-E", "tar", "xf", archive], "cwd", out_dir);
+[ret, msg] = stdlib.sys.subprocess_run([exe, "-E", "tar", "xf", archive], "cwd", out_dir);
 assert(ret == 0, "problem extracting %s   %s", archive, msg)
 
 end

+stdlib/+fileio/extract_zstd.m

@@ -3,7 +3,7 @@
 % is a file executable?
 
 arguments
-  file (1,1) string
+  file (1,1) string {mustBeNonzeroLengthText}
 end
 
 if ~isfile(file)

+stdlib/+fileio/is_exe.m

@@ -1,12 +1,10 @@
 function hash = md5sum(file)
 % compute MD5 hash of file
 arguments
-  file (1,1) string {mustBeNonzeroLengthText}
+  file (1,1) string {mustBeFile}
 end
 
-import stdlib.fileio.expanduser
-
-file = expanduser(file);
+file = stdlib.fileio.expanduser(file);
 
 if ismac
   [stat,hash] = system("md5 -r " + file);

+stdlib/+fileio/md5sum.m

@@ -0,0 +1,8 @@
+function mustBeFile(a)
+arguments
+  a string {mustBeNonzeroLengthText}
+end
+
+assert(all(isfile(stdlib.fileio.expanduser(a)), 'all'), "%s is not a file", a)
+
+end

+stdlib/+fileio/private/mustBeFile.m

@@ -0,0 +1,7 @@
+function mustBeNonzeroLengthText(a)
+
+if ~((ischar(a) || isstring(a) || iscellstr(a)) && all(strlength(a) > 0, 'all'))
+    error("MATLAB:validators:mustBeNonzeroLengthText", "text must have non-zero length")
+end
+
+end

+stdlib/+fileio/private/mustBeNonzeroLengthText.m

@@ -1,12 +1,10 @@
 function hash = sha256sum(file)
 % compute sha256 hash of file
 arguments
-  file (1,1) string {mustBeNonzeroLengthText}
+  file (1,1) string {mustBeFile}
 end
 
-import stdlib.fileio.expanduser
-
-file = expanduser(file);
+file = stdlib.fileio.expanduser(file);
 
 if ismac
   [stat,hash] = system("shasum --algorithm 256 --binary " + file);

+stdlib/+fileio/sha256sum.m

@@ -17,14 +17,10 @@
 else
   file = expanduser(file);
   dcpl = 'H5P_DEFAULT';
-  try
+  if isfile(file)
     fid = H5F.open(file, 'H5F_ACC_RDWR', dcpl);
-  catch e
-    if e.identifier == "MATLAB:imagesci:hdf5io:resourceNotFound"
-      fid = H5F.create(file);
-    else
-      rethrow(e)
-    end
+  else
+    fid = H5F.create(file);
   end
 end
 

+stdlib/+hdf5nc/h5create_group.m

@@ -1,25 +1,23 @@
-function exists = h5exists(file, varnames)
+function exists = h5exists(file, vars)
 % check if object(s) exists in HDF5 file
 %
 % parameters
 % ----------
 % file: HDF5 filename
-% varname: name of variable in file
+% varname: path(s) of variable in file
 %
 % returns
 % -------
 % exists: boolean (scalar or vector)
 
 arguments
-  file (1,1) string {mustBeNonzeroLengthText}
-  varnames (1,:) string {mustBeNonempty,mustBeNonzeroLengthText}
+  file (1,1) string {mustBeFile}
+  vars (1,:) string {mustBeNonempty,mustBeNonzeroLengthText}
 end
 
-import stdlib.hdf5nc.h5variables
-
-i = startsWith(varnames, "/");
-varnames(i) = extractAfter(varnames(i), 1);
+i = startsWith(vars, "/");
+vars(i) = extractAfter(vars(i), 1);
 % NOT contains because we want exact string match
-exists = ismember(varnames, h5variables(file));
+exists = ismember(vars, stdlib.hdf5nc.h5variables(file));
 
 end % function