dedupe

scivision · scivision · commit 00b08e9bb507 · 2025-08-12T13:08:35.000-04:00
diff --git a/+stdlib/+dotnet/filesystem_type.m b/+stdlib/+dotnet/filesystem_type.m
@@ -1,9 +1,9 @@
 %% DOTNET.FILESYSTEM_TYPE type of the partition e.g. NTFS, ext4, ...
 
-function t = filesystem_type(p)
+function t = filesystem_type(file)
 
-if stdlib.exists(p)
-  t = char(System.IO.DriveInfo(stdlib.absolute(p)).DriveFormat);
+if stdlib.exists(file)
+  t = char(System.IO.DriveInfo(stdlib.absolute(file)).DriveFormat);
   % https://learn.microsoft.com/en-us/dotnet/api/system.io.driveinfo.driveformat
 else
   t = '';
diff --git a/+stdlib/+java/device.m b/+stdlib/+java/device.m
@@ -1,6 +1,8 @@
-function i = device(p)
+function i = device(file)
 
 opt = javaMethod("values", "java.nio.file.LinkOption");
-i = uint64(javaMethod("getAttribute", "java.nio.file.Files", javaPathObject(p), "unix:dev", opt));
+p = javaPathObject(file);
+i = java.nio.file.Files.getAttribute(p, "unix:dev", opt);
 
+i = uint64(i);
 end
diff --git a/+stdlib/+java/disk_available.m b/+stdlib/+java/disk_available.m
@@ -1,5 +1,6 @@
-function f = disk_available(d)
+function i = disk_available(file)
 
-f = uint64(javaObject("java.io.File", d).getUsableSpace());
+i = java.io.File(file).getUsableSpace();
 
+i = uint64(i);
 end
diff --git a/+stdlib/+java/file_checksum.m b/+stdlib/+java/file_checksum.m
@@ -12,7 +12,7 @@
 fid = fopen(file, 'r');
 assert(fid > 1, "could not open file %s", file)
 
-inst = javaMethod("getInstance", "java.security.MessageDigest", hash_method);
+inst = java.security.MessageDigest.getInstance(hash_method);
 while ~feof(fid)
   % https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/security/MessageDigest.html#update(byte)
   inst.update(fread(fid, file_chunk, '*uint8'));
diff --git a/+stdlib/+java/filesystem_type.m b/+stdlib/+java/filesystem_type.m
@@ -1,7 +1,7 @@
-function t = filesystem_type(p)
+function t = filesystem_type(file)
 
-if stdlib.exists(p)
-  t = char(javaMethod("getFileStore", "java.nio.file.Files", javaPathObject(p)).type);
+if stdlib.exists(file)
+  t = char(java.nio.file.Files.getFileStore(javaPathObject(file)).type);
 else
   t = '';
 end
diff --git a/+stdlib/+java/set_modtime.m b/+stdlib/+java/set_modtime.m
@@ -1,9 +1,9 @@
 %% JAVA.SET_MODTIME set the modification time of a filepath
 
-function ok = set_modtime(p, t)
+function ok = set_modtime(file, t)
 
 utc = convertTo(datetime(t, 'TimeZone', "UTC"), "posixtime");
 
-ok = javaObject("java.io.File", p).setLastModified(int64(utc) * 1000);
+ok = javaObject("java.io.File", file).setLastModified(int64(utc) * 1000);
 
 end
diff --git a/+stdlib/+native/create_symlink.m b/+stdlib/+native/create_symlink.m
@@ -1,10 +1,13 @@
 function ok = create_symlink(target, link)
 
-if stdlib.exists(target) && ~stdlib.exists(link)
+try
   createSymbolicLink(link, target);
   ok = true;
-else
-  ok = false;
+catch e
+  switch e.identifier
+    case {'MATLAB:io:filesystem:symlink:FileExists', 'MATLAB:io:filesystem:symlink:TargetNotFound'}, ok = false;
+    otherwise, rethrow(e)
+  end
 end
 
 end
diff --git a/+stdlib/+python/device.m b/+stdlib/+python/device.m
@@ -1,13 +1,13 @@
-function i = device(p)
+function i = device(file)
 
 i = 0;
 
 try
-  i = int64(py.os.stat(p).st_dev);
+  i = int64(py.os.stat(file).st_dev);
   % int64 first is for Matlab <= R2022a
 catch e
   if ~contains(e.message, "FileNotFoundError")
-    warning(e.identifier, "device(%s) failed: %s", p, e.message)
+    warning(e.identifier, "device(%s) failed: %s", file, e.message)
   end
 end
 
diff --git a/+stdlib/+python/disk_available.m b/+stdlib/+python/disk_available.m
@@ -1,15 +1,5 @@
-function f = disk_available(p)
+function i = disk_available(file)
 
-f = uint64(0);
-
-if ~stdlib.exists(p), return, end
-
-try
-  di = py.shutil.disk_usage(p);
-  f = uint64(int64(di.free));
-  % int64 first is for Matlab <= R2022a
-catch e
-  warning(e.identifier, "disk_available(%s) failed: %s", p, e.message);
-end
+i = disk_usage(file, 'free');
 
 end
diff --git a/+stdlib/+python/disk_capacity.m b/+stdlib/+python/disk_capacity.m
@@ -1,17 +1,5 @@
-function f = disk_capacity(p)
+function i = disk_capacity(file)
 
-f = uint64(0);
-
-if ~stdlib.exists(p), return, end
-
-try
-  di = py.shutil.disk_usage(p);
-  f = int64(di.total);
-  % int64 first is for Matlab <= R2022a
-catch e
-  warning(e.identifier, "disk_capacity(%s) failed: %s", p, e.message);
-end
-
-f = uint64(f);
+i = disk_usage(file, 'total');
 
 end
diff --git a/+stdlib/+python/private/disk_usage.m b/+stdlib/+python/private/disk_usage.m
@@ -0,0 +1,18 @@
+function i = disk_usage(file, v)
+
+try
+  u = py.shutil.disk_usage(file);
+  switch v
+    case 'total', i = u.total;
+    case 'free', i = u.free;
+    otherwise, error('stdlib:python:disk_usage:valueError', 'unknown disk_usage property %s', v)
+  end
+ 
+  i = int64(i);
+  % int64 first is for Matlab <= R2022a
+catch
+  i = 0;
+end
+
+i = uint64(i);
+end
diff --git a/+stdlib/+python/set_modtime.m b/+stdlib/+python/set_modtime.m
@@ -1,16 +1,16 @@
-function ok = set_modtime(p, dt)
+function ok = set_modtime(file, dt)
 
 ok = false;
-if ~isfile(p), return, end
+if ~isfile(file), return, end
 
 utc = convertTo(datetime(dt, 'TimeZone', "UTC"), "posixtime");
 
 try
-  s = py.os.stat(p);
-  py.os.utime(p, py.tuple([s.st_atime, utc]));
+  s = py.os.stat(file);
+  py.os.utime(file, py.tuple([s.st_atime, utc]));
   ok = true;
 catch e
-  warning(e.identifier, "set_modtime(%s, %s) failed: %s", p, utc, e.message);
+  warning(e.identifier, "set_modtime(%s, %s) failed: %s", file, utc, e.message);
   ok = false;
 end
 
diff --git a/+stdlib/+sys/set_modtime.m b/+stdlib/+sys/set_modtime.m
@@ -1,23 +1,23 @@
-function ok = set_modtime(p, dt)
+function ok = set_modtime(file, dt)
 
 ok = false;
 
-if ~isfile(p), return, end
+if ~isfile(file), return, end
 
 if ispc()
-  cmd = sprintf('pwsh -Command "(Get-Item ''%s'').LastWriteTime = ''%s''"', p, string(dt, "yyyy-MM-dd HH:mm:ss"));
+  cmd = sprintf('pwsh -Command "(Get-Item ''%s'').LastWriteTime = ''%s''"', file, string(dt, "yyyy-MM-dd HH:mm:ss"));
 elseif ismac()
-  cmd = sprintf("touch -mt %s %s", string(dt, "yyyyMMddHHmm"), p);
+  cmd = sprintf("touch -mt %s %s", string(dt, "yyyyMMddHHmm"), file);
 else
   % https://man7.org/linux/man-pages/man1/touch.1.html
-  cmd = sprintf("touch -t %s %s", string(dt, "yyyyMMddHHmm"), p);
+  cmd = sprintf("touch -t %s %s", string(dt, "yyyyMMddHHmm"), file);
 end
 
 [s, m] = system(cmd);
 ok = s == 0;
 
 if ~ok
-  warning("stdlib:set_modtime:ValueError", "%s   set modification time of %s: %s", cmd, p, m);
+  warning("stdlib:set_modtime:ValueError", "%s   set modification time of %s: %s", cmd, file, m);
 end
 
 end
diff --git a/+stdlib/checkRAM.m b/+stdlib/checkRAM.m
@@ -8,7 +8,7 @@
 function [OK,newSizeBytes,freebytes] = checkRAM(newSize, myclass)
 arguments
   newSize (1,:) {mustBeNumeric}
-  myclass {mustBeTextScalar}
+  myclass
 end
 
 % get available RAM
diff --git a/+stdlib/create_symlink.m b/+stdlib/create_symlink.m
@@ -9,8 +9,8 @@
 
 function [ok, b] = create_symlink(target, link, backend)
 arguments
-  target {mustBeTextScalar}
-  link {mustBeTextScalar}
+  target
+  link
   backend (1,:) string = ["native", "dotnet", "python", "sys"]
 end
 
diff --git a/+stdlib/device.m b/+stdlib/device.m
@@ -8,7 +8,7 @@
 
 function [i, b] = device(file, backend)
 arguments
-  file {mustBeTextScalar}
+  file
   backend (1,:) string = ["java", "python", "sys"]
 end
 
diff --git a/+stdlib/disk_available.m b/+stdlib/disk_available.m
@@ -12,7 +12,7 @@
 
 function [f, b] = disk_available(filepath, backend)
 arguments
-  filepath {mustBeTextScalar}
+  filepath
   backend (1,:) string = ["java", "dotnet", "python", "sys"]
 end
 
diff --git a/+stdlib/disk_capacity.m b/+stdlib/disk_capacity.m
@@ -10,7 +10,7 @@
 
 function [f, b] = disk_capacity(filepath, backend)
 arguments
-  filepath {mustBeTextScalar}
+  filepath
   backend (1,:) string = ["java", "dotnet", "python", "sys"]
 end
 
diff --git a/+stdlib/expanduser.m b/+stdlib/expanduser.m
@@ -5,38 +5,32 @@
 % the string $HOME is not handled.
 %
 %%% Inputs
-% * p: path to expand, if tilde present
+% * file: path to expand, if tilde present
 %%% Outputs
 % * e: expanded path
 
-function e = expanduser(p)
+function e = expanduser(file)
 arguments
-  p {mustBeTextScalar}
+  file (1,1) string
 end
 
 
 pat = ['~[/\', filesep, ']+|^~$'];
 
-[i0, i1] = regexp(p, pat, 'once');
+[i0, i1] = regexp(file, pat, 'once');
 
 if isempty(i0)
   % no leading ~ or it's ~user, which we don't handle
-  e = p;
+  e = file;
   return
 end
 
-home = stdlib.homedir();
+home = string(stdlib.homedir());
 
-if i1 - i0 == 0 || strlength(p) == i1
+if i1 - i0 == 0 || strlength(file) == i1
   e = home;
-elseif isstring(p)
-  e = strjoin([home, extractAfter(p, i1)], filesep);
 else
-  e = strjoin({home, p(i1:end)}, filesep);
-end
-
-if isstring(p)
-  e = string(e);
+  e = strjoin([home, extractAfter(file, i1)], filesep);
 end
 
 end
diff --git a/+stdlib/file_checksum.m b/+stdlib/file_checksum.m
@@ -4,7 +4,8 @@
 %
 %%% Inputs
 % * file: file or to hash
-% * method:  "MD5", "SHA-1", "SHA-256", etc.
+% * hash_method:  "MD5", "SHA-1", "SHA-256", etc.
+% * backend: backend to use
 %%% Outputs
 % * hash: string hash
 % * b: backend used
@@ -13,8 +14,8 @@
 
 function [hash, b] = file_checksum(file, hash_method, backend)
 arguments
-  file {mustBeTextScalar}
-  hash_method {mustBeTextScalar}
+  file
+  hash_method
   backend (1,:)  string = ["java", "dotnet", "sys"]
 end
 
diff --git a/+stdlib/filesystem_type.m b/+stdlib/filesystem_type.m
@@ -4,13 +4,14 @@
 %
 %% Inputs
 % * file: path to check
+% * backend: backend to use
 %% Outputs
 % * t: filesystem type
 % * b: backend used
 
 function [t, b] = filesystem_type(file, backend)
 arguments
-  file {mustBeTextScalar}
+  file
   backend (1,:) string = ["java", "dotnet", "python", "sys"]
 end
 
diff --git a/+stdlib/ncsize.m b/+stdlib/ncsize.m
@@ -2,15 +2,15 @@
 % get size (shape) of a data file variable
 %
 %%% Inputs
-% filename: data filename
+% file: data filepath
 % variable: name of variable inside file
 %%% Outputs
 % fsize: vector of variable size per dimension. Empty if scalar variable.
 
 function fsize = ncsize(file, variable)
 arguments
-  file {mustBeTextScalar}
-  variable {mustBeTextScalar}
+  file
+  variable
 end
 
 dsi = ncinfo(file, variable);
diff --git a/+stdlib/ncvariables.m b/+stdlib/ncvariables.m
@@ -10,8 +10,8 @@
 
 function names = ncvariables(file, group)
 arguments
-  file {mustBeTextScalar}
-  group {mustBeTextScalar} = ''
+  file
+  group (1,1) string = ""
 end
 
 
diff --git a/+stdlib/private/h5save_exist.m b/+stdlib/private/h5save_exist.m
@@ -3,9 +3,9 @@
 
 function h5save_exist(filename, varname, A, sizeA)
 arguments
-  filename {mustBeTextScalar}
-  varname {mustBeTextScalar}
-  A {mustBeNonempty}
+  filename
+  varname
+  A
   sizeA (1,:) double {mustBeInteger,mustBeNonnegative} = []
 end
 
diff --git a/+stdlib/private/h5save_new.m b/+stdlib/private/h5save_new.m
@@ -3,9 +3,9 @@
 
 function h5save_new(filename, varname, A, sizeA, compressLevel)
 arguments
-  filename {mustBeTextScalar}
-  varname {mustBeTextScalar}
-  A {mustBeNonempty}
+  filename
+  varname
+  A
   sizeA (1,:) double {mustBeInteger,mustBeNonnegative} = []
   compressLevel (1,1) double {mustBeInteger,mustBeNonnegative} = 0
 end
diff --git a/+stdlib/private/h5save_scalar.m b/+stdlib/private/h5save_scalar.m
diff --git a/+stdlib/private/ncsave_exist.m b/+stdlib/private/ncsave_exist.m
diff --git a/+stdlib/private/ncsave_new.m b/+stdlib/private/ncsave_new.m
diff --git a/+stdlib/set_modtime.m b/+stdlib/set_modtime.m
diff --git a/+stdlib/touch.m b/+stdlib/touch.m
diff --git a/+stdlib/version_atleast.m b/+stdlib/version_atleast.m
diff --git a/Readme.md b/Readme.md
diff --git a/test/TestExpanduser.m b/test/TestExpanduser.m
diff --git a/test/TestNetCDF.m b/test/TestNetCDF.m
diff --git a/test_main.m b/test_main.m
