filesystem_type: choose_method

Author: scivision

+stdlib/+dotnet/filesystem_type.m

@@ -2,12 +2,11 @@
 
 function t = filesystem_type(p)
 
-if ~stdlib.exists(p)
+if stdlib.exists(p)
+  t = string(System.IO.DriveInfo(stdlib.absolute(p)).DriveFormat);
+  % https://learn.microsoft.com/en-us/dotnet/api/system.io.driveinfo.driveformat
+else
   t = string.empty;
-  return
 end
 
-t = string(System.IO.DriveInfo(stdlib.absolute(p)).DriveFormat);
-% https://learn.microsoft.com/en-us/dotnet/api/system.io.driveinfo.driveformat
-
 end

+stdlib/+java/filesystem_type.m

@@ -1,10 +1,9 @@
 function t = filesystem_type(p)
 
-if ~stdlib.exists(p)
+if stdlib.exists(p)
+  t = string(javaMethod("getFileStore", "java.nio.file.Files", javaPathObject(p)).type);
+else
   t = string.empty;
-  return
 end
 
-t = string(javaMethod("getFileStore", "java.nio.file.Files", javaPathObject(p)).type);
-
 end

+stdlib/filesystem_type.m

@@ -2,16 +2,14 @@
 %
 % example outputs: NTFS, ext4, apfs, ...
 
-function t = filesystem_type(p)
-
-if stdlib.has_java()
-  t = stdlib.java.filesystem_type(p);
-elseif stdlib.has_dotnet()
-  t = stdlib.dotnet.filesystem_type(p);
-elseif stdlib.python.has_psutil()
-  t = stdlib.python.filesystem_type(p);
-else
-  t = stdlib.sys.filesystem_type(p);
+function t = filesystem_type(file, method)
+arguments
+  file {mustBeTextScalar}
+  method (1,:) string = ["java", "dotnet", "python", "sys"]
 end
 
+fun = choose_method(method, "filesystem_type");
+
+t = fun(file);
+
 end

test/TestDisk.m

@@ -12,7 +12,7 @@
 disk_ac_fun = {'sys', 'dotnet', 'java', 'python'}
 disk_ac_name = {'disk_available', 'disk_capacity'}
 hl_fun = {'java', 'python'}
-fst_fun = {@stdlib.filesystem_type, @stdlib.sys.filesystem_type, @stdlib.dotnet.filesystem_type, @stdlib.java.filesystem_type, @stdlib.python.filesystem_type}
+fst_fun = {'sys', 'dotnet', 'java', 'python'}
 owner_fun = {@stdlib.get_owner, @stdlib.sys.get_owner, @stdlib.dotnet.get_owner, @stdlib.java.get_owner, @stdlib.python.get_owner}
 end
 
@@ -59,14 +59,18 @@ function test_hard_link_count(tc, hl_fun)
 
 
 function test_filesystem_type(tc, Ps, fst_fun)
-is_capable(tc, fst_fun)
-
-t = fst_fun(Ps);
+tc.assertNotEmpty(which("stdlib." + fst_fun + ".filesystem_type"))
+try
+  t = stdlib.filesystem_type(Ps, fst_fun);
+catch e
+  tc.verifyEqual(e.identifier, 'stdlib:choose_method:NameError', e.message)
+  return
+end
 tc.verifyClass(t, 'string')
 
-
 if stdlib.exists(Ps)
   tc.assumeFalse(isempty(t) && tc.CI, "Some CI block viewing their filesystem type")
+  tc.assertNotEmpty(t)
   tc.verifyGreaterThan(strlength(t), 0)
 else
   tc.verifyEmpty(t)