disk_{available,capacity}: speedup

Author: scivision

+stdlib/+java/disk_available.m

@@ -1,9 +1,15 @@
 function i = disk_available(file)
 
-i = java.io.File(file).getUsableSpace();
-if i < 1
+try
+  i = java.io.File(file).getUsableSpace();
+  if i < 1
+    i = [];
+  end
+catch e
+  javaException(e)
   i = [];
 end
 
 i = uint64(i);
+
 end

+stdlib/+java/disk_capacity.m

@@ -1,9 +1,15 @@
 function i = disk_capacity(file)
 
-i = java.io.File(file).getTotalSpace();
-if i < 1
+try
+  i = java.io.File(file).getTotalSpace();
+  if i < 1
+    i = [];
+  end
+catch
+  javaException(e)
   i = [];
 end
 
 i = uint64(i);
+
 end

+stdlib/+python/private/disk_usage.m

@@ -15,4 +15,5 @@
 end
 
 i = uint64(i);
+
 end

+stdlib/disk_available.m

@@ -16,9 +16,26 @@
   backend (1,:) string = ["java", "dotnet", "python", "sys"]
 end
 
-o = stdlib.Backend(mfilename(), backend);
-i = o.func(file);
+i = uint64.empty;
 
-b = o.backend;
+for b = backend
+  switch b
+    case 'dotnet'
+      i = stdlib.dotnet.disk_available(file);
+    case 'java'
+      i = stdlib.java.disk_available(file);
+    case 'python'
+      if stdlib.matlabOlderThan('R2022a'), continue, end
+      i = stdlib.python.disk_available(file);
+    case 'sys'
+      i = stdlib.sys.disk_available(file);
+    otherwise
+      error("stdlib:disk_available:ValueError", "Unknown backend: %s", b)
+  end
+
+  if ~isempty(i)
+    return
+  end
+end
 
 end

+stdlib/disk_capacity.m

@@ -14,8 +14,26 @@
   backend (1,:) string = ["java", "dotnet", "python", "sys"]
 end
 
-o = stdlib.Backend(mfilename(), backend);
-i = o.func(file);
+i = uint64.empty;
+
+for b = backend
+  switch b
+    case 'dotnet'
+      i = stdlib.dotnet.disk_capacity(file);
+    case 'java'
+      i = stdlib.java.disk_capacity(file);
+    case 'python'
+      if stdlib.matlabOlderThan('R2022a'), continue, end
+      i = stdlib.python.disk_capacity(file);
+    case 'sys'
+      i = stdlib.sys.disk_capacity(file);
+    otherwise
+      error("stdlib:disk_capacity:ValueError", "Unknown backend: %s", b)
+  end
+
+  if ~isempty(i)
+    return
+  end
+end
 
-b = o.backend;
 end

test/TestDisk.m

@@ -41,7 +41,8 @@ function test_dirs(tc)
 methods (Test)
 
 function test_disk_available(tc, Ps, B_disk)
-r = stdlib.disk_available(Ps, B_disk);
+[r, b] = stdlib.disk_available(Ps, B_disk);
+tc.assertEqual(char(b), B_disk)
 
 tc.verifyClass(r, 'uint64')
 
@@ -54,7 +55,8 @@ function test_disk_available(tc, Ps, B_disk)
 
 
 function test_disk_capacity(tc, Ps, B_disk)
-r = stdlib.disk_capacity(Ps, B_disk);
+[r, b] = stdlib.disk_capacity(Ps, B_disk);
+tc.assertEqual(char(b), B_disk)
 
 tc.verifyClass(r, 'uint64')