filesystem_type: more robust, don't require java on Windows

Author: scivision

+stdlib/filesystem_type.m

@@ -1,24 +1,26 @@
 %% FILESYSTEM_TYPE tell type of filesystem
-% requires: java
+% optional: java
 %
-% example outputs: ntfs, ext4, apfs, ...
-%
-% if empty output or error, try specifying the drive root
-% like "/" or "C:/"
+% example outputs: NTFS, ext4, apfs, ...
 
 function t = filesystem_type(p)
 arguments
-  p {mustBeTextScalar} = ''
+  p {mustBeTextScalar}
 end
 
-op = javaPathObject(p);
+t = "";
+if ~stdlib.exists(p), return, end
 
-if stdlib.isoctave()
-  t = javaMethod("getFileStore", "java.nio.file.Files", op).type;
+if ispc()
+  t = string(System.IO.DriveInfo(stdlib.absolute(p)).DriveFormat);
 else
-  t = java.nio.file.Files.getFileStore(op).type.string;
-end
+  op = javaPathObject(p);
 
+  if stdlib.isoctave()
+    t = javaMethod("getFileStore", "java.nio.file.Files", op).type;
+  else
+    t = java.nio.file.Files.getFileStore(op).type.string;
+  end
 end
 
 %!assert(!isempty(filesystem_type(pwd)))

test/TestDisk.m

@@ -33,5 +33,21 @@ function test_disk_capacity(tc, Ps)
 end
 end
 
+
+function test_filesystem_type(tc, Ps)
+
+tc.assumeTrue(ispc() || stdlib.has_java())
+
+s = stdlib.filesystem_type(Ps);
+tc.verifyClass(s, 'string')
+L = strlength(s);
+
+if stdlib.exists(Ps)
+  tc.verifyGreaterThan(L, 0)
+else
+  tc.verifyEqual(L, 0)
+end
+end
+
 end
 end

test/TestJava.m

@@ -40,19 +40,6 @@ function test_owner(tc, Ps)
 
 methods(Test, TestTags="java")
 
-function test_filesystem_type(tc, Ps)
-
-s = stdlib.filesystem_type(Ps);
-tc.verifyClass(s, 'string')
-L = strlength(s);
-
-if strlength(Ps) == 0 || stdlib.exists(Ps)
-  tc.verifyGreaterThan(L, 0)
-else
-  tc.verifyEqual(L, 0)
-end
-end
-
 function test_username(tc)
 u = stdlib.get_username();
 tc.verifyGreaterThan(strlength(u), 0)