javaFileObject() code dedupe

Author: scivision

+stdlib/canonical.m

@@ -51,7 +51,7 @@
 % like C++ filesystem weakly_canonical()
 
 if use_java
-  c = java.io.File(c).getCanonicalPath();
+  c = javaFileObject(c).getCanonicalPath();
 else
   c = stdlib.normalize(c, use_java);
 end

+stdlib/diskfree.m

@@ -10,13 +10,7 @@
   d (1,1) string
 end
 
-if stdlib.isoctave()
-  o = javaObject("java.io.File", d);
-else
-  o = java.io.File(d);
-end
-
-f = o.getUsableSpace();
+f = javaFileObject(d).getUsableSpace();
 
 end
 

+stdlib/exists.m

@@ -16,18 +16,15 @@
   use_java (1,1) logical = false
 end
 
-if stdlib.isoctave()
-  ok = javaObject("java.io.File", p).exists();
-elseif use_java
-
+if use_java
 % https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/nio/file/Files.html#exists(java.nio.file.Path,java.nio.file.LinkOption...)
 % this takes 2x longer than java.io.File.exists()
 % opt = java.nio.file.LinkOption.values;
 % ok = java.nio.file.Files.exists(java.io.File(p).toPath(), opt);
 
 % https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/io/File.html#exists()
 % takes 2x longer than native Matlab isfile || isfolder
-  ok = java.io.File(p).exists();
+  ok = javaFileObject(p).exists();
 else
   ok = isfile(p) || isfolder(p);
 end

+stdlib/file_size.m

@@ -3,14 +3,11 @@
 function s = file_size(p, use_java)
 arguments
   p (1,1) string {mustBeFile}
-  use_java (1,1) logical = false
+  use_java (1,1) logical = true
 end
 
-if stdlib.isoctave()
-  s = javaObject("java.io.File", p).length();
-elseif use_java
-% several percent slower than native Matlab
-  s = java.io.File(p).length;
+if use_java
+  s = javaFileObject(p).length();
 else
   s = dir(p);
   if isempty(s)

+stdlib/filesystem_type.m

@@ -7,11 +7,11 @@
   p (1,1) string
 end
 
+op = javaFileObject(p).toPath();
+
 if stdlib.isoctave()
-  op = javaObject("java.io.File", p).toPath();
   t = javaMethod("getFileStore", "java.nio.file.Files", op).type;
 else
-  op = java.io.File(p).toPath();
   t = string(java.nio.file.Files.getFileStore(op).type);
 end
 

+stdlib/get_modtime.m

@@ -6,12 +6,8 @@
 end
 
 if stdlib.exists(p)
-  if stdlib.isoctave()
-    o = javaObject("java.io.File", p);
-  else
-    o = java.io.File(p);
-  end
-  utc = o.lastModified() / 1000;
+
+  utc = javaFileObject(p).lastModified() / 1000;
 
   try
     t = datetime(utc, "ConvertFrom", "PosixTime");

+stdlib/get_owner.m

@@ -8,13 +8,14 @@
 % https://docs.oracle.com/en/java/javase/22/docs/api/java.base/java/nio/file/Files.html#getOwner(java.nio.file.Path,java.nio.file.LinkOption...)
 % https://docs.oracle.com/en/java/javase/22/docs/api/java.base/java/nio/file/LinkOption.html
 
+op = javaFileObject(p).toPath();
+
 if stdlib.isoctave()
   opt = javaMethod("values", "java.nio.file.LinkOption");
-  op = javaObject("java.io.File", p).toPath();
   n = javaMethod("getOwner", "java.nio.file.Files", op, opt).toString();
 else
   opt = java.nio.file.LinkOption.values;
-  n = string(java.nio.file.Files.getOwner(java.io.File(p).toPath(), opt));
+  n = string(java.nio.file.Files.getOwner(op, opt));
 end
 
 end

+stdlib/hard_link_count.m

@@ -14,13 +14,13 @@
   return
 end
 
+op = javaFileObject(p).toPath();
+
 if stdlib.isoctave()
   opt = javaMethod("values", "java.nio.file.LinkOption");
-  op = javaObject("java.io.File", p).toPath();
   c = javaMethod("getAttribute", "java.nio.file.Files", op, "unix:nlink", opt);
 else
   opt = java.nio.file.LinkOption.values;
-  op = java.io.File(p).toPath();
   c = java.nio.file.Files.getAttribute(op, "unix:nlink", opt);
 end
 

+stdlib/is_absolute.m

@@ -9,14 +9,15 @@
   use_java (1,1) logical = false
 end
 
-if stdlib.isoctave()
-  % not is_absolute_filename() because this is a stricter check for "c:" false
-  isabs = javaObject("java.io.File", p).isAbsolute();
-elseif use_java
+% not Octave is_absolute_filename() because this is a stricter check for "c:" false
+
+if use_java
   % java is about 5x to 10x slower than intrinsic
   % https://docs.oracle.com/en/java/javase/22/docs/api/java.base/java/io/File.html#isAbsolute()
-  isabs = java.io.File(p).toPath().isAbsolute();
+  isabs = javaFileObject(p).toPath().isAbsolute();
+
 else
+
   L = strlength(p);
   if ispc
     s = "";
@@ -27,6 +28,7 @@
   else
     isabs = L >= 1 && startsWith(p, "/");
   end
+
 end
 
 end

+stdlib/is_exe.m

@@ -9,8 +9,10 @@
   use_java (1,1) logical = true
 end
 
+
+ok = false;
+
 if ~isfile(p)
-  ok = false;
   return
 end
 
@@ -20,26 +22,13 @@
 % more complicated
 % ok = java.nio.file.Files.isExecutable(java.io.File(stdlib.canonical(p)).toPath());
 
-try
-  ok = java.io.File(p).canExecute();
-catch e
-  if strcmp(e.identifier, "Octave:undefined-function")
-    ok = javaObject("java.io.File", p).canExecute();
-  else
-    rethrow(e);
-  end
-end
+ok = javaFileObject(p).canExecute();
 
 else
 
-  if ~strlength(p)
-    ok = false;
-    return
-  end
-
-  [status, v] = fileattrib(p);
+[status, v] = fileattrib(p);
 
-  ok = status ~= 0 && (v.UserExecute || (~isnan(v.GroupExecute) && v.GroupExecute) || (~isnan(v.OtherExecute) && v.OtherExecute));
+ok = status ~= 0 && (v.UserExecute || (~isnan(v.GroupExecute) && v.GroupExecute) || (~isnan(v.OtherExecute) && v.OtherExecute));
 
 end