filesystem_type: robust

Author: scivision

+stdlib/+python/filesystem_type.m

@@ -2,16 +2,17 @@
 
 t = '';
 
+try
 % important for heuristic matching
-p = py.str(file);
-if ~py.os.path.exists(p)
-  return
-end
+  p = py.str(file);
+  if ~py.os.path.exists(p)
+    return
+  end
 
-p = py.os.path.abspath(p);
+  p = py.os.path.abspath(p);
 
 % https://psutil.readthedocs.io/en/stable/index.html?highlight=disk_partitions#psutil.disk_partitions
-try
+
   for part = py.psutil.disk_partitions()
     prt = part{1};
     if p.startswith(prt.mountpoint)

+stdlib/filesystem_type.m

@@ -6,17 +6,35 @@
 % * file: path to check
 % * backend: backend to use
 %%% Outputs
-% * t: filesystem type
+% * r: filesystem type
 % * b: backend used
 
-function [t, b] = filesystem_type(file, backend)
+function [r, b] = filesystem_type(file, backend)
 arguments
   file
   backend (1,:) string = ["java", "dotnet", "python", "sys"]
 end
 
-o = stdlib.Backend(mfilename(), backend);
-t = o.func(file);
-b = o.backend;
+r = '';
+
+for b = backend
+  switch b
+    case "java"
+      r = stdlib.java.filesystem_type(file);
+    case "dotnet"
+      r = stdlib.dotnet.filesystem_type(file);
+    case "python"
+      if stdlib.matlabOlderThan('R2022a'), continue, end
+      r = stdlib.python.filesystem_type(file);
+    case "sys"
+      r = stdlib.sys.filesystem_type(file);
+    otherwise
+      error("stdlib:filesystem_type:ValueError", "Unknown backend: %s", b)
+  end
+
+  if ~isempty(r)
+    return
+  end
+end
 
 end

test/TestDisk.m

@@ -100,7 +100,8 @@ function test_hard_link_count(tc, B_hard_link_count)
 
 
 function test_filesystem_type(tc, Ps, B_filesystem_type)
-t = stdlib.filesystem_type(Ps, B_filesystem_type);
+[t, b] = stdlib.filesystem_type(Ps, B_filesystem_type);
+tc.assertEqual(char(b), B_filesystem_type)
 tc.verifyClass(t, 'char')
 
 if ~stdlib.exists(Ps)

test/TestSys.m

@@ -102,15 +102,17 @@ function test_cpu_arch(tc)
 end
 
 function test_ram_total(tc, B_ram_total)
-t = stdlib.ram_total(B_ram_total);
+[t, b] = stdlib.ram_total(B_ram_total);
+tc.assertEqual(char(b), B_ram_total)
 tc.verifyClass(t, 'uint64')
 tc.verifyGreaterThan(t, 0)
 end
 
 
 function test_ram_free(tc, B_ram_free)
 % don't verify less than or equal to total due to shaky system measurements'
-f = stdlib.ram_free(B_ram_free);
+[f, b] = stdlib.ram_free(B_ram_free);
+tc.assertEqual(char(b), B_ram_free)
 
 tc.verifyClass(f, 'uint64')
 if B_ram_free == "python" && ~stdlib.python.has_psutil()