handle exceptions

Author: scivision

+stdlib/+java/device.m

@@ -13,9 +13,7 @@
 try
   i = java.nio.file.Files.getAttribute(javaAbsolutePath(file), "unix:dev", opt);
 catch e
-  if class(e.ExceptionObject) ~= "java.nio.file.NoSuchFileException"
-    rethrow(e)
-  end
+  javaException(e)
 end
 
 i = uint64(i);

+stdlib/+java/disk_available.m

@@ -1,7 +1,4 @@
 function i = disk_available(file)
-arguments
-  file (1,1) string
-end
 
 i = java.io.File(file).getUsableSpace();
 if i < 1

+stdlib/+java/disk_capacity.m

@@ -1,7 +1,4 @@
 function i = disk_capacity(file)
-arguments
-  file (1,1) string
-end
 
 i = java.io.File(file).getTotalSpace();
 if i < 1

+stdlib/+java/filesystem_type.m

@@ -7,15 +7,16 @@
 % this try-catch is faster and more robust
 
 function t = filesystem_type(file)
-arguments
-  file (1,1) string
-end
 
 t = '';
-if stdlib.strempty(file), return, end
+if stdlib.strempty(file)
+  return
+end
 
-try %#ok<TRYNC>
+try
   t = char(java.nio.file.Files.getFileStore(javaPathObject(file)).type);
+catch e
+  javaException(e)
 end
 
 end

+stdlib/+java/get_owner.m

@@ -20,8 +20,10 @@
 % We only saw this issue with R2025a on windows-2025 GA runner image.
 opt = java.nio.file.LinkOption.values();
 
-try %#ok<TRYNC>
+try
   n = string(java.nio.file.Files.getOwner(javaAbsolutePath(file), opt));
+catch e
+  javaException(e)
 end
 
 end

+stdlib/+java/hard_link_count.m

@@ -4,9 +4,7 @@
 try
   i = java.nio.file.Files.getAttribute(javaAbsolutePath(file), "unix:nlink", opt);
 catch e
-  if class(e.ExceptionObject) ~= "java.nio.file.NoSuchFileException"
-    rethrow(e)
-  end
+  javaException(e)
   i = [];
 end
 end

+stdlib/+java/inode.m

@@ -13,9 +13,7 @@
 try
   i = java.nio.file.Files.getAttribute(javaAbsolutePath(file), "unix:ino", opt);
 catch e
-  if class(e.ExceptionObject) ~= "java.nio.file.NoSuchFileException"
-    rethrow(e)
-  end
+  javaException(e)
 end
 
 i = uint64(i);

+stdlib/+java/private/javaException.m

@@ -0,0 +1,8 @@
+function javaException(e)
+
+switch class(e.ExceptionObject)
+  case {'java.nio.file.NoSuchFileException', 'java.nio.file.NotLinkException'}
+  otherwise, rethrow(e)
+end
+
+end

+stdlib/+java/read_symlink.m

@@ -8,7 +8,8 @@
 % https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/nio/file/Files.html#readSymbolicLink(java.nio.file.Path)
 try
   r = string(java.nio.file.Files.readSymbolicLink(javaAbsolutePath(file)));
-catch
+catch e
+  javaException(e)
   r = "";
 end
 

+stdlib/+python/filesystem_type.m

@@ -20,7 +20,7 @@
     end
   end
 catch e
-  rethrow(e)
+  pythonException(e)
 end
 
 end